diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java index 9112de874c..6e7dd4d048 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java @@ -44,7 +44,7 @@ public abstract class AmqpBaseOutboundEndpointSpec, E extends AbstractAmqpOutboundEndpoint> extends MessageHandlerSpec { - protected final DefaultAmqpHeaderMapper headerMapper = DefaultAmqpHeaderMapper.outboundMapper(); + protected final DefaultAmqpHeaderMapper headerMapper = DefaultAmqpHeaderMapper.outboundMapper(); // NOSONAR final /** * Set a custom {@link AmqpHeaderMapper} for mapping request and reply headers. diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java index 97be221e6a..4f7944d551 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java @@ -40,7 +40,7 @@ public abstract class AmqpInboundChannelAdapterSpec extends AmqpBaseInboundChannelAdapterSpec implements ComponentsRegistration { - protected final AbstractMessageListenerContainerSpec listenerContainerSpec; + protected final AbstractMessageListenerContainerSpec listenerContainerSpec; // NOSONAR final AmqpInboundChannelAdapterSpec(AbstractMessageListenerContainerSpec listenerContainerSpec) { super(new AmqpInboundChannelAdapter(listenerContainerSpec.get())); diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java index d4a40c8083..aa16d36f20 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java @@ -40,7 +40,7 @@ public abstract class AmqpInboundGatewaySpec extends AmqpBaseInboundGatewaySpec implements ComponentsRegistration { - protected final AbstractMessageListenerContainerSpec listenerContainerSpec; + protected final AbstractMessageListenerContainerSpec listenerContainerSpec; // NOSONAR final AmqpInboundGatewaySpec(AbstractMessageListenerContainerSpec listenerContainerSpec) { super(new AmqpInboundGateway(listenerContainerSpec.get())); diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpPollableMessageChannelSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpPollableMessageChannelSpec.java index 5884d3321f..de06e9d1b3 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpPollableMessageChannelSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpPollableMessageChannelSpec.java @@ -42,7 +42,7 @@ import org.springframework.util.Assert; public class AmqpPollableMessageChannelSpec> extends MessageChannelSpec { - protected final AmqpChannelFactoryBean amqpChannelFactoryBean; + protected final AmqpChannelFactoryBean amqpChannelFactoryBean; // NOSONAR final AmqpPollableMessageChannelSpec(ConnectionFactory connectionFactory) { this(new AmqpChannelFactoryBean(false), connectionFactory); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java index 9afb0d953b..0f10d9ae88 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java @@ -47,7 +47,7 @@ public class QueueChannel extends AbstractPollableChannel implements QueueChanne private final Queue> queue; - protected final Semaphore queueSemaphore = new Semaphore(0); + protected final Semaphore queueSemaphore = new Semaphore(0); // NOSONAR final /** * Create a channel with the specified queue. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoCodec.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoCodec.java index f3c28af5ee..7026617eb0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoCodec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoCodec.java @@ -39,7 +39,7 @@ import com.esotericsoftware.kryo.pool.KryoPool; */ public abstract class AbstractKryoCodec implements Codec { - protected final KryoPool pool; + protected final KryoPool pool; // NOSONAR final protected AbstractKryoCodec() { KryoFactory factory = () -> { @@ -53,7 +53,7 @@ public abstract class AbstractKryoCodec implements Codec { } @Override - public void encode(final Object object, OutputStream outputStream) throws IOException { + public void encode(final Object object, OutputStream outputStream) { Assert.notNull(object, "cannot encode a null object"); Assert.notNull(outputStream, "'outputSteam' cannot be null"); final Output output = (outputStream instanceof Output ? (Output) outputStream : new Output(outputStream)); @@ -77,7 +77,7 @@ public abstract class AbstractKryoCodec implements Codec { } @Override - public T decode(InputStream inputStream, final Class type) throws IOException { + public T decode(InputStream inputStream, final Class type) { Assert.notNull(inputStream, "'inputStream' cannot be null"); Assert.notNull(type, "'type' cannot be null"); final Input input = (inputStream instanceof Input ? (Input) inputStream : new Input(inputStream)); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java index 08c2bd19ea..4f219db711 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java @@ -46,7 +46,7 @@ public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHa private static final String VERSION = "5.2"; - protected final Log logger = LogFactory.getLog(this.getClass()); + protected final Log logger = LogFactory.getLog(this.getClass()); // NOSONAR final private final NamespaceHandlerDelegate delegate = new NamespaceHandlerDelegate(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/ErrorMessagePublisher.java b/spring-integration-core/src/main/java/org/springframework/integration/core/ErrorMessagePublisher.java index 0f44733f71..ed005378e9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/ErrorMessagePublisher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/ErrorMessagePublisher.java @@ -50,9 +50,9 @@ import org.springframework.util.Assert; */ public class ErrorMessagePublisher implements BeanFactoryAware { - protected final Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final - protected final MessagingTemplate messagingTemplate = new MessagingTemplate(); + protected final MessagingTemplate messagingTemplate = new MessagingTemplate(); // NOSONAR final private DestinationResolver channelResolver; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java index 69ea5a931d..e656d6088b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java @@ -43,7 +43,7 @@ import org.springframework.util.Assert; */ public abstract class AbstractDispatcher implements MessageDispatcher { - protected final Log logger = LogFactory.getLog(this.getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final private volatile int maxSubscribers = Integer.MAX_VALUE; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java index e1fcd5a78f..d2eb072363 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java @@ -65,7 +65,7 @@ public class RoundRobinLoadBalancingStrategy implements LoadBalancingStrategy { return new Iterator() { - int currentIndex = 0; + private int currentIndex = 0; public boolean hasNext() { return this.currentIndex < reorderedHandlers.length; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java index 842d75a3b5..a3144aadd0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java @@ -51,7 +51,7 @@ import reactor.util.function.Tuple2; public abstract class ConsumerEndpointSpec, H extends MessageHandler> extends EndpointSpec { - protected final List adviceChain = new LinkedList<>(); + protected final List adviceChain = new LinkedList<>(); // NOSONAR final protected ConsumerEndpointSpec(H messageHandler) { super(messageHandler); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java index ed051952a5..cc0a799879 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java @@ -47,11 +47,11 @@ public abstract class EndpointSpec, F extends Be extends IntegrationComponentSpec> implements ComponentsRegistration { - protected final Map componentsToRegister = new LinkedHashMap<>(); + protected final Map componentsToRegister = new LinkedHashMap<>(); // NOSONAR final - protected H handler; + protected H handler; // NOSONAR final - protected F endpointFactoryBean; + protected F endpointFactoryBean; // NOSONAR final @SuppressWarnings("unchecked") protected EndpointSpec(H handler) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/LoadBalancingChannelSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/LoadBalancingChannelSpec.java index 9fa05b67b6..73105958e0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/LoadBalancingChannelSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/LoadBalancingChannelSpec.java @@ -32,28 +32,28 @@ import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrateg public abstract class LoadBalancingChannelSpec, C extends AbstractMessageChannel> extends MessageChannelSpec { - protected LoadBalancingStrategy loadBalancingStrategy = new RoundRobinLoadBalancingStrategy(); + protected LoadBalancingStrategy loadBalancingStrategy = new RoundRobinLoadBalancingStrategy(); // NOSONAR - protected Boolean failover; + protected Boolean failover; // NOSONAR - protected Integer maxSubscribers; + protected Integer maxSubscribers; // NOSONAR protected LoadBalancingChannelSpec() { super(); } - public S loadBalancer(LoadBalancingStrategy loadBalancingStrategy) { - this.loadBalancingStrategy = loadBalancingStrategy; + public S loadBalancer(LoadBalancingStrategy loadBalancingStrategyToSet) { + this.loadBalancingStrategy = loadBalancingStrategyToSet; return _this(); } - public S failover(Boolean failover) { - this.failover = failover; + public S failover(Boolean failoverToSet) { + this.failover = failoverToSet; return _this(); } - public S maxSubscribers(Integer maxSubscribers) { - this.maxSubscribers = maxSubscribers; + public S maxSubscribers(Integer maxSubscribersToSet) { + this.maxSubscribers = maxSubscribersToSet; return _this(); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageChannelSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageChannelSpec.java index 83ec56645f..25ce8a6f17 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageChannelSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageChannelSpec.java @@ -49,7 +49,7 @@ public abstract class MessageChannelSpec, C e private final List interceptors = new LinkedList<>(); - protected C channel; + protected C channel; // NOSONAR private MessageConverter messageConverter; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/QueueChannelSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/QueueChannelSpec.java index 434038c69b..59732c7a63 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/QueueChannelSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/QueueChannelSpec.java @@ -31,9 +31,9 @@ import org.springframework.messaging.Message; */ public class QueueChannelSpec extends MessageChannelSpec { - protected Queue> queue; + protected Queue> queue; // NOSONAR - protected Integer capacity; + protected Integer capacity; // NOSONAR QueueChannelSpec() { super(); @@ -84,13 +84,13 @@ public class QueueChannelSpec extends MessageChannelSpec implements RequestReplyHeaderMappe private static final Collection TRANSIENT_HEADER_NAMES = Arrays.asList( MessageHeaders.ID, MessageHeaders.TIMESTAMP); - protected final Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final private final String standardHeaderPrefix; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java index 6f751a34e6..1bd3f79855 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java @@ -40,7 +40,7 @@ import org.springframework.messaging.Message; public abstract class AbstractMessageGroupStore extends AbstractBatchingMessageGroupStore implements MessageGroupStore, Iterable { - protected final Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final private final Collection expiryCallbacks = new LinkedHashSet<>(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJsonInboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJsonInboundMessageMapper.java index 0cb738ab17..1aaa1c484b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJsonInboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJsonInboundMessageMapper.java @@ -29,6 +29,7 @@ import org.springframework.util.Assert; * to a {@link org.springframework.messaging.Message} with the specified payload type. * * @author Artem Bilan + * @author Gary Russell * @since 3.0 * * @see JsonInboundMessageMapper @@ -47,11 +48,11 @@ public abstract class AbstractJsonInboundMessageMapper

implements InboundMess DEFAULT_HEADER_TYPES.put(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, Integer.class); } - protected final Type payloadType; + protected final Type payloadType; // NOSONAR final - protected final Map> headerTypes = DEFAULT_HEADER_TYPES; + protected final Map> headerTypes = DEFAULT_HEADER_TYPES; // NOSONAR final - protected volatile boolean mapToPayload = false; + private boolean mapToPayload = false; public AbstractJsonInboundMessageMapper(Type payloadType) { Assert.notNull(payloadType, "payloadType must not be null"); @@ -66,6 +67,10 @@ public abstract class AbstractJsonInboundMessageMapper

implements InboundMess this.mapToPayload = mapToPayload; } + public boolean isMapToPayload() { + return this.mapToPayload; + } + protected abstract Object readPayload(P parser, String jsonMessage); protected abstract Map readHeaders(P parser, String jsonMessage); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java index 59b325cf7c..66b6e548a3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java @@ -79,7 +79,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; */ public class EmbeddedJsonHeadersMessageMapper implements BytesMessageMapper { - protected final Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final private final ObjectMapper objectMapper; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonInboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonInboundMessageMapper.java index 5a9dbce4ff..1d18fb1490 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonInboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonInboundMessageMapper.java @@ -52,10 +52,6 @@ public class JsonInboundMessageMapper extends AbstractJsonInboundMessageMapper { - protected final IntegrationResourceHolder resourceHolder; + protected final IntegrationResourceHolder resourceHolder; // NOSONAR final private boolean shouldUnbindAtCompletion = true; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/SimplePool.java b/spring-integration-core/src/main/java/org/springframework/integration/util/SimplePool.java index b8010d80a0..98239e328c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/SimplePool.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/SimplePool.java @@ -41,7 +41,7 @@ import org.springframework.util.Assert; */ public class SimplePool implements Pool { - protected final Log logger = LogFactory.getLog(this.getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final private final Semaphore permits = new Semaphore(0); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/UpperBound.java b/spring-integration-core/src/main/java/org/springframework/integration/util/UpperBound.java index 2a5bceed25..160edb6da6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/UpperBound.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/UpperBound.java @@ -26,12 +26,13 @@ import java.util.concurrent.TimeUnit; * @author Mark Fisher * @author Iwein Fuld * @author Artem Bilan + * @author Gary Russell * * @since 2.0 */ public final class UpperBound { - public final Semaphore semaphore; + private final Semaphore semaphore; /** diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java index 3af2231323..69e6d22426 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java @@ -47,7 +47,7 @@ public abstract class RemoteFileInboundChannelAdapterSpec implements ComponentsRegistration { - protected final AbstractInboundFileSynchronizer synchronizer; + protected final AbstractInboundFileSynchronizer synchronizer; // NOSONAR final private ExpressionFileListFilter expressionFileListFilter; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/RotatingServerAdvice.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/RotatingServerAdvice.java index d08bf28de3..bff2119200 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/RotatingServerAdvice.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/aop/RotatingServerAdvice.java @@ -117,9 +117,9 @@ public class RotatingServerAdvice extends AbstractMessageSourceAdvice { */ public static class StandardRotationPolicy implements RotationPolicy { - protected final Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final - protected final DelegatingSessionFactory factory; + protected final DelegatingSessionFactory factory; // NOSONAR final private final List keyDirectories = new ArrayList<>(); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java index 6409e7c549..189239a085 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java @@ -42,23 +42,23 @@ public abstract class AbstractFtpSessionFactory implements protected final Log logger = LogFactory.getLog(this.getClass()); // NOSONAR - protected FTPClientConfig config; + private FTPClientConfig config; - protected String username; + private String username; - protected String host; + private String host; - protected String password; + private String password; - protected int port = FTP.DEFAULT_PORT; + private int port = FTP.DEFAULT_PORT; - protected int bufferSize = 2048; //see https://issues.apache.org/jira/browse/NET-207 + private int bufferSize = 2048; //see https://issues.apache.org/jira/browse/NET-207 - protected int clientMode = FTPClient.ACTIVE_LOCAL_DATA_CONNECTION_MODE; + private int clientMode = FTPClient.ACTIVE_LOCAL_DATA_CONNECTION_MODE; - protected int fileType = FTP.BINARY_FILE_TYPE; + private int fileType = FTP.BINARY_FILE_TYPE; - protected String controlEncoding = FTP.DEFAULT_CONTROL_ENCODING; + private String controlEncoding = FTP.DEFAULT_CONTROL_ENCODING; private Integer connectTimeout; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java index 49bfd28091..45efb7073a 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java @@ -49,11 +49,11 @@ public abstract class HttpInboundEndpointSupportSpec implements ComponentsRegistration { - protected final RequestMapping requestMapping = new RequestMapping(); + protected final RequestMapping requestMapping = new RequestMapping(); // NOSONAR final - protected final Map headerExpressions = new HashMap<>(); + protected final Map headerExpressions = new HashMap<>(); // NOSONAR final - protected final HeaderMapper headerMapper = DefaultHttpHeaderMapper.inboundMapper(); + protected final HeaderMapper headerMapper = DefaultHttpHeaderMapper.inboundMapper(); // NOSONAR final private HeaderMapper explicitHeaderMapper; @@ -67,12 +67,12 @@ public abstract class HttpInboundEndpointSupportSpec requestMapping) { - requestMapping.accept(new RequestMappingSpec(this.requestMapping)); + public S requestMapping(Consumer mapping) { + mapping.accept(new RequestMappingSpec(this.requestMapping)); return _this(); } @@ -123,14 +123,14 @@ public abstract class HttpInboundEndpointSupportSpec headerExpressions) { - Assert.notNull(headerExpressions, "'headerExpressions' must not be null"); + public S headerExpressions(Map expressions) { + Assert.notNull(expressions, "'headerExpressions' must not be null"); this.headerExpressions.clear(); - this.headerExpressions.putAll(headerExpressions); + this.headerExpressions.putAll(expressions); return _this(); } @@ -171,12 +171,12 @@ public abstract class HttpInboundEndpointSupportSpec headerMapper) { - this.target.setHeaderMapper(headerMapper); - this.explicitHeaderMapper = headerMapper; + public S headerMapper(HeaderMapper mapper) { + this.target.setHeaderMapper(mapper); + this.explicitHeaderMapper = mapper; return _this(); } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java index 2f8937bb2e..84183d8530 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java @@ -73,67 +73,67 @@ public abstract class AbstractConnectionFactory extends IntegrationObjectSupport private static final int DEFAULT_READ_DELAY = 100; - private volatile String host; - - private volatile int port; - - private volatile TcpListener listener; - - private volatile TcpSender sender; - - private volatile int soTimeout = -1; - - private volatile int soSendBufferSize; - - private volatile int soReceiveBufferSize; - - private volatile boolean soTcpNoDelay; - - private volatile int soLinger = -1; // don't set by default - - private volatile boolean soKeepAlive; - - private volatile int soTrafficClass = -1; // don't set by default - - private volatile Executor taskExecutor; - - private volatile boolean privateExecutor; - - private volatile Deserializer deserializer = new ByteArrayCrLfSerializer(); - - private volatile boolean deserializerSet; - - private volatile Serializer serializer = new ByteArrayCrLfSerializer(); - - private volatile TcpMessageMapper mapper = new TcpMessageMapper(); - - private volatile boolean mapperSet; - - private volatile boolean singleUse; - - private volatile boolean active; - - private volatile TcpConnectionInterceptorFactoryChain interceptorFactoryChain; - - private volatile boolean lookupHost = true; + protected final Object lifecycleMonitor = new Object(); // NOSONAR final private final Map connections = new ConcurrentHashMap(); - private volatile TcpSocketSupport tcpSocketSupport = new DefaultTcpSocketSupport(); - - protected final Object lifecycleMonitor = new Object(); - - private volatile long nextCheckForClosedNioConnections; - - private volatile int nioHarvestInterval = DEFAULT_NIO_HARVEST_INTERVAL; - - private volatile ApplicationEventPublisher applicationEventPublisher; - private final BlockingQueue delayedReads = new LinkedBlockingQueue(); - private volatile long readDelay = DEFAULT_READ_DELAY; + private String host; - private volatile Integer sslHandshakeTimeout; + private int port; + + private TcpListener listener; + + private TcpSender sender; + + private int soTimeout = -1; + + private int soSendBufferSize; + + private int soReceiveBufferSize; + + private boolean soTcpNoDelay; + + private int soLinger = -1; // don't set by default + + private boolean soKeepAlive; + + private int soTrafficClass = -1; // don't set by default + + private Executor taskExecutor; + + private boolean privateExecutor; + + private Deserializer deserializer = new ByteArrayCrLfSerializer(); + + private boolean deserializerSet; + + private Serializer serializer = new ByteArrayCrLfSerializer(); + + private TcpMessageMapper mapper = new TcpMessageMapper(); + + private boolean mapperSet; + + private boolean singleUse; + + private TcpConnectionInterceptorFactoryChain interceptorFactoryChain; + + private boolean lookupHost = true; + + private TcpSocketSupport tcpSocketSupport = new DefaultTcpSocketSupport(); + + private long nextCheckForClosedNioConnections; + + private int nioHarvestInterval = DEFAULT_NIO_HARVEST_INTERVAL; + + private ApplicationEventPublisher applicationEventPublisher; + + private long readDelay = DEFAULT_READ_DELAY; + + private Integer sslHandshakeTimeout; + + private volatile boolean active; public AbstractConnectionFactory(int port) { this.port = port; @@ -504,6 +504,10 @@ public abstract class AbstractConnectionFactory extends IntegrationObjectSupport this.readDelay = readDelay; } + protected Object getLifecycleMonitor() { + return this.lifecycleMonitor; + } + @Override protected void onInit() { super.onInit(); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java index 24236aa6ef..5b7f8ed2d1 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java @@ -52,7 +52,7 @@ import org.springframework.util.Assert; */ public abstract class TcpConnectionSupport implements TcpConnection { - protected final Log logger = LogFactory.getLog(this.getClass()); + protected final Log logger = LogFactory.getLog(this.getClass()); // NOSONAR final private final CountDownLatch listenerRegisteredLatch = new CountDownLatch(1); @@ -69,28 +69,28 @@ public abstract class TcpConnectionSupport implements TcpConnection { private final SocketInfo socketInfo; @SuppressWarnings("rawtypes") - private volatile Deserializer deserializer; + private Deserializer deserializer; @SuppressWarnings("rawtypes") - private volatile Serializer serializer; + private Serializer serializer; - private volatile TcpMessageMapper mapper; + private TcpMessageMapper mapper; - private volatile TcpListener listener; + private TcpListener listener; - private volatile TcpSender sender; + private TcpSender sender; - private volatile String connectionId; + private String connectionId; - private volatile String hostName = "unknown"; + private String hostName = "unknown"; - private volatile String hostAddress = "unknown"; + private String hostAddress = "unknown"; - private volatile String connectionFactoryName = "unknown"; + private String connectionFactoryName = "unknown"; - private volatile boolean noReadErrorOnClose; + private boolean noReadErrorOnClose; - private volatile boolean manualListenerRegistration; + private boolean manualListenerRegistration; public TcpConnectionSupport() { this(null); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java index 9742b2fbc4..afa303b208 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java @@ -65,21 +65,21 @@ public class TcpMessageMapper implements OutboundMessageMapper, BeanFactoryAware { - protected final Log logger = LogFactory.getLog(this.getClass()); + protected final Log logger = LogFactory.getLog(this.getClass()); // NOSONAR final - private volatile String charset = "UTF-8"; + private String charset = "UTF-8"; - private volatile boolean stringToBytes = true; + private boolean stringToBytes = true; - private volatile boolean applySequence = false; + private boolean applySequence = false; - private volatile MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory(); + private MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory(); - private volatile boolean messageBuilderFactorySet; + private boolean messageBuilderFactorySet; - private volatile String contentType = "application/octet-stream;charset=" + this.charset; + private String contentType = "application/octet-stream;charset=" + this.charset; - private volatile boolean addContentTypeHeader; + private boolean addContentTypeHeader; private BeanFactory beanFactory; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java index 34024dacb7..764db23686 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java @@ -66,7 +66,7 @@ public class ChannelPublishingJmsMessageListener implements SessionAwareMessageListener, InitializingBean, TrackableComponent, BeanFactoryAware { - protected final Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final private volatile boolean expectReply; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsInboundChannelAdapterSpec.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsInboundChannelAdapterSpec.java index f31682e797..f814a9a8c2 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsInboundChannelAdapterSpec.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsInboundChannelAdapterSpec.java @@ -42,7 +42,7 @@ import org.springframework.util.Assert; public class JmsInboundChannelAdapterSpec> extends MessageSourceSpec { - protected final JmsTemplateSpec jmsTemplateSpec = new JmsTemplateSpec(); + protected final JmsTemplateSpec jmsTemplateSpec = new JmsTemplateSpec(); // NOSONAR final JmsInboundChannelAdapterSpec(JmsTemplate jmsTemplate) { this.target = new JmsDestinationPollingSource(jmsTemplate); diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsOutboundChannelAdapterSpec.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsOutboundChannelAdapterSpec.java index 245e4a05a6..c6c258c866 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsOutboundChannelAdapterSpec.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsOutboundChannelAdapterSpec.java @@ -44,7 +44,7 @@ import org.springframework.util.Assert; public class JmsOutboundChannelAdapterSpec> extends MessageHandlerSpec { - protected final JmsTemplateSpec jmsTemplateSpec = new JmsTemplateSpec(); + protected final JmsTemplateSpec jmsTemplateSpec = new JmsTemplateSpec(); // NOSONAR final JmsOutboundChannelAdapterSpec(JmsTemplate jmsTemplate) { this.target = new JmsSendingMessageHandler(jmsTemplate); diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPollableMessageChannelSpec.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPollableMessageChannelSpec.java index 6d8ad5d15e..e9884ff73a 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPollableMessageChannelSpec.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPollableMessageChannelSpec.java @@ -41,7 +41,7 @@ import org.springframework.lang.Nullable; public class JmsPollableMessageChannelSpec> extends MessageChannelSpec { - protected final JmsChannelFactoryBean jmsChannelFactoryBean; + protected final JmsChannelFactoryBean jmsChannelFactoryBean; // NOSONAR final JmsPollableMessageChannelSpec(ConnectionFactory connectionFactory) { this(new JmsChannelFactoryBean(false), connectionFactory); diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/AbstractJpaOperations.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/AbstractJpaOperations.java index 89972a68db..c39d27ed80 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/AbstractJpaOperations.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/AbstractJpaOperations.java @@ -32,7 +32,7 @@ import org.springframework.util.Assert; */ abstract class AbstractJpaOperations implements JpaOperations, InitializingBean { - protected EntityManager entityManager; + private EntityManager entityManager; private EntityManagerFactory entityManagerFactory; @@ -43,11 +43,18 @@ abstract class AbstractJpaOperations implements JpaOperations, InitializingBean } + protected EntityManager getEntityManager() { + return this.entityManager; + } + + public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) { Assert.notNull(entityManagerFactory, "The provided entityManagerFactory must not be null."); this.entityManagerFactory = entityManagerFactory; } + + @Override public final void afterPropertiesSet() { this.onInit(); } diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/DefaultJpaOperations.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/DefaultJpaOperations.java index 5e8eb4efbb..0604960193 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/DefaultJpaOperations.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/DefaultJpaOperations.java @@ -21,6 +21,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import javax.persistence.EntityManager; import javax.persistence.Parameter; import javax.persistence.Query; @@ -51,7 +52,7 @@ public class DefaultJpaOperations extends AbstractJpaOperations { @Override public void delete(Object entity) { Assert.notNull(entity, "The entity must not be null!"); - entityManager.remove(entity); + getEntityManager().remove(entity); } @Override @@ -78,6 +79,7 @@ public class DefaultJpaOperations extends AbstractJpaOperations { } } + EntityManager entityManager = getEntityManager(); final String entityName = JpaUtils.getEntityName(entityManager, entityClass); final String queryString = JpaUtils.getQueryString(JpaUtils.DELETE_ALL_QUERY_STRING, entityName); @@ -88,32 +90,32 @@ public class DefaultJpaOperations extends AbstractJpaOperations { @Override public int executeUpdate(String updateQuery, ParameterSource source) { - Query query = entityManager.createQuery(updateQuery); + Query query = getEntityManager().createQuery(updateQuery); setParametersIfRequired(updateQuery, source, query); return query.executeUpdate(); } @Override public int executeUpdateWithNamedQuery(String updateQuery, ParameterSource source) { - Query query = entityManager.createNamedQuery(updateQuery); + Query query = getEntityManager().createNamedQuery(updateQuery); setParametersIfRequired(updateQuery, source, query); return query.executeUpdate(); } @Override public int executeUpdateWithNativeQuery(String updateQuery, ParameterSource source) { - Query query = entityManager.createNativeQuery(updateQuery); + Query query = getEntityManager().createNativeQuery(updateQuery); setParametersIfRequired(updateQuery, source, query); return query.executeUpdate(); } @Override public T find(Class entityType, Object id) { - return entityManager.find(entityType, id); + return getEntityManager().find(entityType, id); } private Query getQuery(String queryString, ParameterSource source) { - Query query = entityManager.createQuery(queryString); + Query query = getEntityManager().createQuery(queryString); setParametersIfRequired(queryString, source, query); return query; } @@ -122,8 +124,8 @@ public class DefaultJpaOperations extends AbstractJpaOperations { @Override public List getResultListForClass(Class entityClass, int firstResult, int maxNumberOfResults) { - final String entityName = JpaUtils.getEntityName(entityManager, entityClass); - final Query query = entityManager.createQuery("select x from " + entityName + " x", entityClass); + final String entityName = JpaUtils.getEntityName(getEntityManager(), entityClass); + final Query query = getEntityManager().createQuery("select x from " + entityName + " x", entityClass); if (firstResult > 0) { query.setFirstResult(firstResult); } @@ -139,7 +141,7 @@ public class DefaultJpaOperations extends AbstractJpaOperations { public List getResultListForNamedQuery(String selectNamedQuery, ParameterSource parameterSource, int firstResult, int maxNumberOfResults) { - final Query query = entityManager.createNamedQuery(selectNamedQuery); + final Query query = getEntityManager().createNamedQuery(selectNamedQuery); setParametersIfRequired(selectNamedQuery, parameterSource, query); if (firstResult > 0) { @@ -160,10 +162,10 @@ public class DefaultJpaOperations extends AbstractJpaOperations { final Query query; if (entityClass == null) { - query = entityManager.createNativeQuery(selectQuery); + query = getEntityManager().createNativeQuery(selectQuery); } else { - query = entityManager.createNativeQuery(selectQuery, entityClass); + query = getEntityManager().createNativeQuery(selectQuery, entityClass); } setParametersIfRequired(selectQuery, parameterSource, query); @@ -235,6 +237,7 @@ public class DefaultJpaOperations extends AbstractJpaOperations { private Object persistOrMerge(Object entity, boolean isMerge, int flushSize, boolean clearOnFlush) { Object result = null; + EntityManager entityManager = getEntityManager(); if (entity instanceof Iterable) { result = persistOrMergeIterable(entity, isMerge, flushSize, clearOnFlush); } @@ -269,6 +272,7 @@ public class DefaultJpaOperations extends AbstractJpaOperations { List mergedEntities = new ArrayList(); + EntityManager entityManager = getEntityManager(); for (Object iteratedEntity : entities) { if (iteratedEntity == null) { nullEntities++; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java index 7c758ce4b8..9640b6c547 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java @@ -69,21 +69,6 @@ public abstract class AbstractConfigurableMongoDbMessageStore extends AbstractMe public static final String SEQUENCE_NAME = "messagesSequence"; - /** - * The name of the message header that stores a flag to indicate that the message has been saved. This is an - * optimization for the put method. - * @deprecated since 5.0. This constant isn't used any more. - */ - @Deprecated - public static final String SAVED_KEY = "MongoDbMessageStore.SAVED"; - - /** - * The name of the message header that stores a timestamp for the time the message was inserted. - * @deprecated since 5.0. This constant isn't used any more. - */ - @Deprecated - public static final String CREATED_DATE_KEY = "MongoDbMessageStore.CREATED_DATE"; - protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR - final private static final RuntimeException NOT_IMPLEMENTED = @@ -93,7 +78,7 @@ public abstract class AbstractConfigurableMongoDbMessageStore extends AbstractMe protected final MongoDbFactory mongoDbFactory; // NOSONAR - final - protected MongoTemplate mongoTemplate; + private MongoTemplate mongoTemplate; private MappingMongoConverter mappingMongoConverter; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java index 4c175c54e4..274684f409 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java @@ -200,7 +200,7 @@ public class ConfigurableMongoDbMessageStore extends AbstractConfigurableMongoDb Sort sort = Sort.by(MessageDocumentFields.LAST_MODIFIED_TIME, MessageDocumentFields.SEQUENCE); Query query = groupIdQuery(groupId).with(sort); - MessageDocument document = mongoTemplate.findAndRemove(query, MessageDocument.class, collectionName); + MessageDocument document = getMongoTemplate().findAndRemove(query, MessageDocument.class, collectionName); Message message = null; if (document != null) { message = document.getMessage(); @@ -222,7 +222,7 @@ public class ConfigurableMongoDbMessageStore extends AbstractConfigurableMongoDb @Override public Iterator iterator() { Query query = Query.query(Criteria.where(MessageDocumentFields.GROUP_ID).exists(true)); - Iterable groupIds = mongoTemplate.getCollection(collectionName) + Iterable groupIds = getMongoTemplate().getCollection(collectionName) .distinct(MessageDocumentFields.GROUP_ID, query.getQueryObject(), String.class); return StreamSupport.stream(groupIds.spliterator(), false) diff --git a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java index b940941ac2..887d467aa8 100644 --- a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java +++ b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java @@ -73,9 +73,9 @@ public abstract class AbstractStompSessionManager implements StompSessionManager private static final long DEFAULT_RECOVERY_INTERVAL = 10000; - protected final Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final - protected final StompClientSupport stompClient; + protected final StompClientSupport stompClient; // NOSONAR final private final CompositeStompSessionHandler compositeStompSessionHandler = new CompositeStompSessionHandler(); diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424SyslogParser.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424SyslogParser.java index 469b0339fe..0874717912 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424SyslogParser.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424SyslogParser.java @@ -38,7 +38,7 @@ public class RFC5424SyslogParser { protected static final char SPACE = ' '; - protected final boolean retainOriginal; + protected final boolean retainOriginal; // NOSONAR final /** @@ -161,7 +161,7 @@ public class RFC5424SyslogParser { } if (!Character.isDigit(c)) { - throw new IllegalStateException("Year expected @" + r.idx); + throw new IllegalStateException("Year expected @" + r.getIndex()); } StringBuilder dateBuilder = new StringBuilder(); @@ -209,6 +209,10 @@ public class RFC5424SyslogParser { this.line = l; } + public int getIndex() { + return this.idx; + } + public void mark() { this.mark = this.idx; } diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterSupport.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterSupport.java index 7b629a2280..a381754bf5 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterSupport.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterSupport.java @@ -16,9 +16,6 @@ package org.springframework.integration.syslog.inbound; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.syslog.DefaultMessageConverter; import org.springframework.integration.syslog.MessageConverter; @@ -39,11 +36,9 @@ public abstract class SyslogReceivingChannelAdapterSupport extends MessageProduc private volatile int port = DEFAULT_PORT; - protected final Log logger = LogFactory.getLog(this.getClass()); + private MessageConverter converter = new DefaultMessageConverter(); - private volatile MessageConverter converter = new DefaultMessageConverter(); - - private volatile boolean converterSet; + private boolean converterSet; /** * @return The port on which this adapter listens. diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/mock/MockMessageHandler.java b/spring-integration-test/src/main/java/org/springframework/integration/test/mock/MockMessageHandler.java index dc84d821cb..646d97c72b 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/mock/MockMessageHandler.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/mock/MockMessageHandler.java @@ -56,13 +56,13 @@ import org.springframework.messaging.Message; */ public class MockMessageHandler extends AbstractMessageProducingHandler { - protected final List, ?>> messageFunctions = new LinkedList<>(); + protected final List, ?>> messageFunctions = new LinkedList<>(); // NOSONAR final private final CapturingMatcher> capturingMatcher; - protected Function, ?> lastFunction; + protected Function, ?> lastFunction; // NOSONAR - protected boolean hasReplies; + protected boolean hasReplies; // NOSONAR @SuppressWarnings("unchecked") protected MockMessageHandler(ArgumentCaptor> messageArgumentCaptor) { diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java index 2fa2ac9b22..5cc240a222 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java @@ -66,17 +66,17 @@ public abstract class AbstractWebServiceOutboundGateway extends AbstractReplyPro private final Map uriVariableExpressions = new HashMap(); - private volatile StandardEvaluationContext evaluationContext; + private StandardEvaluationContext evaluationContext; - private volatile WebServiceMessageCallback requestCallback; + private WebServiceMessageCallback requestCallback; private WebServiceTemplate webServiceTemplate; - private volatile boolean ignoreEmptyResponses = true; + private boolean ignoreEmptyResponses = true; - private volatile boolean encodeUri = true; + private boolean encodeUri = true; - protected volatile SoapHeaderMapper headerMapper = new DefaultSoapHeaderMapper(); + private SoapHeaderMapper headerMapper = new DefaultSoapHeaderMapper(); private boolean webServiceTemplateExplicitlySet; @@ -143,9 +143,9 @@ public abstract class AbstractWebServiceOutboundGateway extends AbstractReplyPro doSetWebServiceTemplate(webServiceTemplate); } - protected final void doSetWebServiceTemplate(WebServiceTemplate webServiceTemplate) { - Assert.notNull(webServiceTemplate, "'webServiceTemplate' must not be null"); - this.webServiceTemplate = webServiceTemplate; + protected final void doSetWebServiceTemplate(WebServiceTemplate template) { + Assert.notNull(template, "'webServiceTemplate' must not be null"); + this.webServiceTemplate = template; this.webServiceTemplateExplicitlySet = true; } @@ -233,18 +233,18 @@ public abstract class AbstractWebServiceOutboundGateway extends AbstractReplyPro } - protected abstract Object doHandle(String uri, Message requestMessage, - WebServiceMessageCallback requestCallback); + protected abstract Object doHandle(String theUri, Message requestMessage, + WebServiceMessageCallback reqCallback); protected abstract class RequestMessageCallback extends TransformerObjectSupport implements WebServiceMessageCallback { - private final WebServiceMessageCallback requestCallback; + private final WebServiceMessageCallback reqCallback; private final Message requestMessage; public RequestMessageCallback(WebServiceMessageCallback requestCallback, Message requestMessage) { - this.requestCallback = requestCallback; + this.reqCallback = requestCallback; this.requestMessage = requestMessage; } @@ -256,8 +256,8 @@ public abstract class AbstractWebServiceOutboundGateway extends AbstractReplyPro AbstractWebServiceOutboundGateway.this.headerMapper .fromHeadersToRequest(this.requestMessage.getHeaders(), (SoapMessage) message); } - if (this.requestCallback != null) { - this.requestCallback.doWithMessage(message); + if (this.reqCallback != null) { + this.reqCallback.doWithMessage(message); } } diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java index 2657cbbd4a..39544c5c94 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java @@ -64,7 +64,7 @@ public class DefaultSoapHeaderMapper extends AbstractHeaderMapper i STANDARD_HEADER_NAMES.add(WebServiceHeaders.SOAP_ACTION); } - protected final TransformerHelper transformerHelper = new TransformerHelper(); + protected final TransformerHelper transformerHelper = new TransformerHelper(); // NOSONAR final public DefaultSoapHeaderMapper() { super(WebServiceHeaders.PREFIX, STANDARD_HEADER_NAMES, Collections.emptyList()); diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParser.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParser.java index f1ddd67a0b..b5fef23073 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParser.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParser.java @@ -34,7 +34,7 @@ import org.springframework.util.StringUtils; */ public class WebServiceInboundGatewayParser extends AbstractInboundGatewayParser { - protected final Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR final @Override protected String getBeanClassName(Element element) { @@ -75,6 +75,7 @@ public class WebServiceInboundGatewayParser extends AbstractInboundGatewayParser } } + @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { super.doParse(element, parserContext, builder); IntegrationNamespaceUtils.configureHeaderMapper(element, builder, parserContext, DefaultSoapHeaderMapper.class, null); diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareEndpoint.java index 84441b62b0..61b1861f96 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareEndpoint.java @@ -30,9 +30,9 @@ import org.springframework.util.Assert; */ public abstract class AbstractXmppConnectionAwareEndpoint extends MessageProducerSupport { - protected volatile XMPPConnection xmppConnection; + private XMPPConnection xmppConnection; - protected volatile boolean initialized; + private boolean initialized; public AbstractXmppConnectionAwareEndpoint() { @@ -43,6 +43,15 @@ public abstract class AbstractXmppConnectionAwareEndpoint extends MessageProduce this.xmppConnection = xmppConnection; } + protected XMPPConnection getXmppConnection() { + return this.xmppConnection; + } + + @Override + protected boolean isInitialized() { + return this.initialized; + } + @Override protected void onInit() { super.onInit(); diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareMessageHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareMessageHandler.java index 269b31fa73..e0c817a318 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareMessageHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareMessageHandler.java @@ -30,9 +30,9 @@ import org.springframework.util.Assert; */ public abstract class AbstractXmppConnectionAwareMessageHandler extends AbstractMessageHandler { - protected volatile XMPPConnection xmppConnection; + private XMPPConnection xmppConnection; - protected volatile boolean initialized; + private volatile boolean initialized; public AbstractXmppConnectionAwareMessageHandler() { @@ -43,6 +43,14 @@ public abstract class AbstractXmppConnectionAwareMessageHandler extends Abstract this.xmppConnection = xmppConnection; } + protected XMPPConnection getXmppConnection() { + return this.xmppConnection; + } + + @Override + protected boolean isInitialized() { + return this.initialized; + } @Override protected void onInit() { diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java index 69c8649c8a..867546b24b 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java @@ -103,15 +103,16 @@ public class ChatMessageListeningEndpoint extends AbstractXmppConnectionAwareEnd @Override protected void doStart() { - Assert.isTrue(this.initialized, this.getComponentName() + " [" + this.getComponentType() + Assert.isTrue(isInitialized(), this.getComponentName() + " [" + this.getComponentType() + "] must be initialized"); - this.xmppConnection.addAsyncStanzaListener(this.stanzaListener, this.stanzaFilter); + getXmppConnection().addAsyncStanzaListener(this.stanzaListener, this.stanzaFilter); } @Override protected void doStop() { - if (this.xmppConnection != null) { - this.xmppConnection.removeAsyncStanzaListener(this.stanzaListener); + XMPPConnection xmppConnection = getXmppConnection(); + if (xmppConnection != null) { + xmppConnection.removeAsyncStanzaListener(this.stanzaListener); } } diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java index 237eff38e9..ebb8aa2dce 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java @@ -18,8 +18,6 @@ package org.springframework.integration.xmpp.inbound; import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.roster.Roster; @@ -44,9 +42,6 @@ import org.springframework.util.StringUtils; */ public class PresenceListeningEndpoint extends AbstractXmppConnectionAwareEndpoint { - private static final Log logger = LogFactory.getLog(PresenceListeningEndpoint.class); - - private final PresencePublishingRosterListener rosterListener = new PresencePublishingRosterListener(); @@ -66,15 +61,16 @@ public class PresenceListeningEndpoint extends AbstractXmppConnectionAwareEndpoi @Override protected void doStart() { - Assert.isTrue(this.initialized, this.getComponentName() + " [" + this.getComponentType() + "] must be initialized"); - Roster roster = Roster.getInstanceFor(this.xmppConnection); + Assert.isTrue(isInitialized(), this.getComponentName() + " [" + this.getComponentType() + "] must be initialized"); + Roster roster = Roster.getInstanceFor(getXmppConnection()); roster.addRosterListener(this.rosterListener); } @Override protected void doStop() { - if (this.xmppConnection != null) { - Roster.getInstanceFor(this.xmppConnection).removeRosterListener(this.rosterListener); + XMPPConnection xmppConnection = getXmppConnection(); + if (xmppConnection != null) { + Roster.getInstanceFor(xmppConnection).removeRosterListener(this.rosterListener); } } diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java index 6ae1133048..a78d4c544c 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java @@ -85,7 +85,7 @@ public class ChatMessageSendingMessageHandler extends AbstractXmppConnectionAwar @Override protected void handleMessageInternal(Message message) { - Assert.isTrue(this.initialized, getComponentName() + "#" + this.getComponentType() + " must be initialized"); + Assert.isTrue(isInitialized(), getComponentName() + "#" + this.getComponentType() + " must be initialized"); try { Object payload = message.getPayload(); org.jivesoftware.smack.packet.Message xmppMessage = null; @@ -101,11 +101,11 @@ public class ChatMessageSendingMessageHandler extends AbstractXmppConnectionAwar if (this.headerMapper != null) { this.headerMapper.fromHeadersToRequest(message.getHeaders(), xmppMessage); } - - if (!this.xmppConnection.isConnected() && this.xmppConnection instanceof AbstractXMPPConnection) { - ((AbstractXMPPConnection) this.xmppConnection).connect(); + XMPPConnection xmppConnection = getXmppConnection(); + if (!xmppConnection.isConnected() && xmppConnection instanceof AbstractXMPPConnection) { + ((AbstractXMPPConnection) xmppConnection).connect(); } - this.xmppConnection.sendStanza(xmppMessage); + xmppConnection.sendStanza(xmppMessage); } catch (InterruptedException e) { Thread.currentThread().interrupt(); diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandler.java index f34b7b9fb8..af2bd246c2 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandler.java @@ -50,15 +50,16 @@ public class PresenceSendingMessageHandler extends AbstractXmppConnectionAwareMe @Override protected void handleMessageInternal(Message message) { - Assert.state(this.initialized, this.getComponentName() + " must be initialized"); + Assert.state(isInitialized(), getComponentName() + " must be initialized"); Object payload = message.getPayload(); Assert.state(payload instanceof Presence, "Payload must be of type 'org.jivesoftware.smack.packet.Presence', was: " + payload.getClass().getName()); try { - if (!this.xmppConnection.isConnected() && this.xmppConnection instanceof AbstractXMPPConnection) { - ((AbstractXMPPConnection) this.xmppConnection).connect(); + XMPPConnection xmppConnection = getXmppConnection(); + if (!xmppConnection.isConnected() && xmppConnection instanceof AbstractXMPPConnection) { + ((AbstractXMPPConnection) xmppConnection).connect(); } - this.xmppConnection.sendStanza((Presence) payload); + xmppConnection.sendStanza((Presence) payload); } catch (InterruptedException e) { Thread.currentThread().interrupt();