diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java index 5ab74be9aa..6d8df08c04 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java @@ -108,6 +108,7 @@ public class CorrelatingMessageBarrier extends AbstractMessageHandler implements } + @SuppressWarnings("unchecked") @Override public Message receive() { for (Object key : this.correlationLocks.keySet()) { @@ -130,9 +131,7 @@ public class CorrelatingMessageBarrier extends AbstractMessageHandler implements else { remove(key); } - @SuppressWarnings("unchecked") - Message result = (Message) nextMessage; - return result; + return (Message) nextMessage; } } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java index 766782f7b9..3dd3126fb3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java @@ -16,6 +16,7 @@ package org.springframework.integration.aggregator; +import java.io.Serializable; import java.util.Comparator; import org.springframework.integration.IntegrationMessageHeaderAccessor; @@ -25,8 +26,10 @@ import org.springframework.messaging.Message; * @author Mark Fisher * @author Dave Syer * @author Artem Bilan + * @author Gary Russell */ -public class MessageSequenceComparator implements Comparator> { +@SuppressWarnings("serial") +public class MessageSequenceComparator implements Comparator>, Serializable { @Override public int compare(Message o1, Message o2) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java index 04af5da5d3..67f49fe89f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java @@ -193,7 +193,7 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen } // The method may be on an interface, so let's check on the target class as well. Method specificMethod = AopUtils.getMostSpecificMethod(method, targetClass); - return (specificMethod != method && + return (!specificMethod.equals(method) && (AnnotationUtils.getAnnotation(specificMethod, this.annotationType) != null)); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannelReactiveUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannelReactiveUtils.java index 5f558d9550..0f900228e0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannelReactiveUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannelReactiveUtils.java @@ -106,7 +106,8 @@ public final class MessageChannelReactiveUtils { .>create(sink -> sink.onRequest(n -> { Message m; - while (!sink.isCancelled() && n-- > 0 && (m = this.channel.receive()) != null) { + while (!sink.isCancelled() && n-- > 0 + && (m = this.channel.receive()) != null) { // NOSONAR sink.next((Message) m); } }), diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java index 59c580dea7..3e61d020f1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java @@ -39,7 +39,7 @@ public final class FixedSubscriberChannelBeanFactoryPostProcessor implements Bea private final Map candidateFixedChannelHandlerMap; - private FixedSubscriberChannelBeanFactoryPostProcessor(Map candidateHandlers) { + FixedSubscriberChannelBeanFactoryPostProcessor(Map candidateHandlers) { this.candidateFixedChannelHandlerMap = candidateHandlers; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java index f51fca354d..b3697fe7b5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java @@ -158,7 +158,7 @@ public abstract class AbstractMethodAnnotationPostProcessor recipients) { + private void addRecipient(String channelName, String selectorExpression, Queue recipientsToAdd) { Assert.hasText(channelName, "'channelName' must not be empty."); Assert.hasText(selectorExpression, "'selectorExpression' must not be empty."); ExpressionEvaluatingSelector expressionEvaluatingSelector = @@ -145,7 +145,7 @@ public class RecipientListRouter extends AbstractMessageRouter implements Recipi expressionEvaluatingSelector.setBeanFactory(getBeanFactory()); Recipient recipient = new Recipient(channelName, expressionEvaluatingSelector); setupRecipient(recipient); - recipients.add(recipient); + recipientsToAdd.add(recipient); } @Override @@ -158,11 +158,11 @@ public class RecipientListRouter extends AbstractMessageRouter implements Recipi addRecipient(channelName, selector, this.recipients); } - private void addRecipient(String channelName, MessageSelector selector, Queue recipients) { + private void addRecipient(String channelName, MessageSelector selector, Queue recipientsToAdd) { Assert.hasText(channelName, "'channelName' must not be empty."); Recipient recipient = new Recipient(channelName, selector); setupRecipient(recipient); - recipients.add(recipient); + recipientsToAdd.add(recipient); } public void addRecipient(MessageChannel channel) { @@ -208,9 +208,9 @@ public class RecipientListRouter extends AbstractMessageRouter implements Recipi Recipient next = it.next(); MessageSelector selector = next.getSelector(); MessageChannel channel = next.getChannel(); - if (selector instanceof ExpressionEvaluatingSelector && - channel == targetChannel && - ((ExpressionEvaluatingSelector) selector).getExpressionString().equals(selectorExpression)) { + if (selector instanceof ExpressionEvaluatingSelector + && channel.equals(targetChannel) + && ((ExpressionEvaluatingSelector) selector).getExpressionString().equals(selectorExpression)) { it.remove(); counter++; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractTransformer.java index 85a709a7bf..ef14a6a580 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractTransformer.java @@ -37,7 +37,7 @@ public abstract class AbstractTransformer extends IntegrationObjectSupport imple return (result instanceof Message) ? (Message) result : this.getMessageBuilderFactory().withPayload(result).copyHeaders(message.getHeaders()).build(); } - catch (MessageTransformationException e) { + catch (MessageTransformationException e) { // NOSONAR - catch and throw throw e; } catch (Exception e) { diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java index 5680ec1c07..0edcae2047 100644 --- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java +++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java @@ -17,6 +17,7 @@ package org.springframework.integration.feed.inbound; import java.io.Reader; +import java.io.Serializable; import java.net.URL; import java.util.Collections; import java.util.Comparator; @@ -254,7 +255,8 @@ public class FeedEntryMessageSource extends AbstractMessageSource { } - private static final class SyndEntryPublishedDateComparator implements Comparator { + @SuppressWarnings("serial") + private static final class SyndEntryPublishedDateComparator implements Comparator, Serializable { SyndEntryPublishedDateComparator() { super(); diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java index c9024ff767..42da06389f 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java @@ -920,20 +920,20 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply else { outputStream = new BufferedOutputStream(new FileOutputStream(tempFile)); } - if (replacing) { - if (!localFile.delete() && this.logger.isWarnEnabled()) { - this.logger.warn("Failed to delete " + localFile); - } + if (replacing && !localFile.delete() && this.logger.isWarnEnabled()) { + this.logger.warn("Failed to delete " + localFile); } try { session.read(remoteFilePath, outputStream); } catch (Exception e) { /* Some operation systems acquire exclusive file-lock during file processing - and the file can't be deleted without closing streams before. + and the file can't be deleted without closing streams before. */ outputStream.close(); - tempFile.delete(); + if (!tempFile.delete() && this.logger.isWarnEnabled()) { + this.logger.warn("Failed to delete tempFile " + tempFile); + } if (e instanceof RuntimeException) { throw (RuntimeException) e; @@ -953,11 +953,10 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply if (!appending && !tempFile.renameTo(localFile)) { throw new MessagingException("Failed to rename local file"); } - if (this.options.contains(Option.PRESERVE_TIMESTAMP) - || FileExistsMode.REPLACE_IF_MODIFIED.equals(existsMode)) { - if (!localFile.setLastModified(getModified(fileInfo)) && this.logger.isWarnEnabled()) { - logger.warn("Failed to set lastModified on " + localFile); - } + if ((this.options.contains(Option.PRESERVE_TIMESTAMP) + || FileExistsMode.REPLACE_IF_MODIFIED.equals(existsMode)) + && (!localFile.setLastModified(getModified(fileInfo)) && this.logger.isWarnEnabled())) { + logger.warn("Failed to set lastModified on " + localFile); } if (this.options.contains(Option.DELETE)) { boolean result = session.remove(remoteFilePath); diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java index ce0b40f758..a975284ae6 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java @@ -190,32 +190,14 @@ public abstract class AbstractInboundFileSynchronizingMessageSource } } this.fileSource.setDirectory(this.localDirectory); - if (this.localFileListFilter == null) { - this.localFileListFilter = - new FileSystemPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), getComponentName()); - } - FileListFilter filter = buildFilter(); - if (this.scannerExplicitlySet) { - Assert.state(!this.fileSource.isUseWatchService(), - "'useWatchService' and 'scanner' are mutually exclusive."); - this.fileSource.getScanner() - .setFilter(filter); - } - else if (!this.fileSource.isUseWatchService()) { - DirectoryScanner directoryScanner = new DefaultDirectoryScanner(); - directoryScanner.setFilter(filter); - this.fileSource.setScanner(directoryScanner); - } - else { - this.fileSource.setFilter(filter); - } + initFiltersAndScanner(); if (this.getBeanFactory() != null) { this.fileSource.setBeanFactory(this.getBeanFactory()); } this.fileSource.afterPropertiesSet(); this.synchronizer.afterPropertiesSet(); } - catch (RuntimeException e) { + catch (RuntimeException e) { // NOSONAR catch and throw throw e; } catch (Exception e) { @@ -223,6 +205,28 @@ public abstract class AbstractInboundFileSynchronizingMessageSource } } + private void initFiltersAndScanner() { + if (this.localFileListFilter == null) { + this.localFileListFilter = + new FileSystemPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), getComponentName()); + } + FileListFilter filter = buildFilter(); + if (this.scannerExplicitlySet) { + Assert.state(!this.fileSource.isUseWatchService(), + "'useWatchService' and 'scanner' are mutually exclusive."); + this.fileSource.getScanner() + .setFilter(filter); + } + else if (!this.fileSource.isUseWatchService()) { + DirectoryScanner directoryScanner = new DefaultDirectoryScanner(); + directoryScanner.setFilter(filter); + this.fileSource.setScanner(directoryScanner); + } + else { + this.fileSource.setFilter(filter); + } + } + @Override public void start() { this.running = true; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java index b681774939..25a54f6ff8 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java @@ -205,7 +205,7 @@ public class FailoverClientConnectionFactory extends AbstractClientConnectionFac + ", trying another"); } if (!this.factoryIterator.hasNext()) { - if (retried && lastFactoryToTry == null || lastFactoryToTry == nextFactory) { + if (retried && (lastFactoryToTry == null || lastFactoryToTry.equals(nextFactory))) { /* * We've tried every factory including the * one the current connection was on. @@ -249,7 +249,7 @@ public class FailoverClientConnectionFactory extends AbstractClientConnectionFac success = true; } catch (RuntimeException e) { - if (retried && lastFactoryTried == lastFactoryToTry) { + if (retried && lastFactoryTried.equals(lastFactoryToTry)) { logger.error("All connection factories exhausted", e); this.open = false; throw e; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java index 2f2bb7973b..3208ffbc33 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetServerConnectionFactory.java @@ -170,7 +170,7 @@ public class TcpNetServerConnectionFactory extends AbstractServerConnectionFacto try { socket.close(); } - catch (@SuppressWarnings("unused") IOException e1) { + catch (@SuppressWarnings("unused") IOException e1) { // NOSONAR - exception as flow control // empty } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java index 7da4db67d3..a1e5f700ee 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java @@ -444,9 +444,6 @@ public class TcpNioConnection extends TcpConnectionSupport { } sendToPipe(this.rawBuffer); } - catch (RejectedExecutionException e) { - throw e; - } catch (IOException e) { publishConnectionExceptionEvent(e); throw e; @@ -508,9 +505,6 @@ public class TcpNioConnection extends TcpConnectionSupport { } closeConnection(true); } - catch (RejectedExecutionException e) { - throw e; - } catch (Exception e) { logger.error("Exception on Read " + getConnectionId() + " " + diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.java index 64e4f71e32..fdfbd71425 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.java @@ -72,8 +72,8 @@ public class ByteArrayCrLfSerializer extends AbstractPooledBufferByteArraySerial } return n - 1; // trim \r } - catch (SoftEndOfStreamException e) { - throw e; + catch (SoftEndOfStreamException e) { // NOSONAR catch and throw + throw e; // it's an IO exception and we don't want an event for this } catch (IOException e) { publishEvent(e, buffer, n); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayLengthHeaderSerializer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayLengthHeaderSerializer.java index 1f8d8e5057..8ee59ef598 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayLengthHeaderSerializer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayLengthHeaderSerializer.java @@ -277,8 +277,8 @@ public class ByteArrayLengthHeaderSerializer extends AbstractByteArraySerializer } return messageLength; } - catch (SoftEndOfStreamException e) { - throw e; + catch (SoftEndOfStreamException e) { // NOSONAR catch and throw + throw e; // it's an IO exception and we don't want an event for this } catch (IOException e) { publishEvent(e, lengthPart, -1); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayRawSerializer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayRawSerializer.java index fdf7a8e9ba..049d1b8c16 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayRawSerializer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayRawSerializer.java @@ -102,8 +102,8 @@ public class ByteArrayRawSerializer extends AbstractPooledBufferByteArraySeriali } return copyToSizedArray(buffer, n); } - catch (SoftEndOfStreamException e) { - throw e; + catch (SoftEndOfStreamException e) { // NOSONAR catch and throw + throw e; // it's an IO exception and we don't want an event for this } catch (IOException e) { publishEvent(e, buffer, n); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArraySingleTerminatorSerializer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArraySingleTerminatorSerializer.java index 67efe704d9..29a571f85f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArraySingleTerminatorSerializer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArraySingleTerminatorSerializer.java @@ -68,8 +68,8 @@ public class ByteArraySingleTerminatorSerializer extends AbstractPooledBufferByt } return copyToSizedArray(buffer, n); } - catch (SoftEndOfStreamException e) { - throw e; + catch (SoftEndOfStreamException e) { // NOSONAR catch and throw + throw e; // it's an IO exception and we don't want an event for this } catch (IOException e) { publishEvent(e, buffer, n); diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java index de7b3c83e4..9b8e1bbe58 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java @@ -29,6 +29,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource; * reference bean properties in its input. * * @author Dave Syer + * @author Gary Russell * @since 2.0 */ public class BeanPropertySqlParameterSourceFactory implements SqlParameterSourceFactory { @@ -51,8 +52,7 @@ public class BeanPropertySqlParameterSourceFactory implements SqlParameterSource @Override public SqlParameterSource createParameterSource(Object input) { - SqlParameterSource toReturn = new StaticBeanPropertySqlParameterSource(input, this.staticParameters); - return toReturn; + return new StaticBeanPropertySqlParameterSource(input, this.staticParameters); } private static final class StaticBeanPropertySqlParameterSource extends AbstractSqlParameterSource implements diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactory.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactory.java index 64256221ca..0be4135eca 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactory.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactory.java @@ -227,7 +227,7 @@ public class ExpressionEvaluatingSqlParameterSourceFactory extends AbstractExpre public boolean hasValue(String paramName) { try { Object value = doGetValue(paramName, true); - if (value == ERROR) { + if (value.equals(ERROR)) { return false; } } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java index ee9d833b0c..4ac23c51d9 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java @@ -56,7 +56,7 @@ import org.springframework.util.StringUtils; */ public class DefaultJmsHeaderMapper extends JmsHeaderMapper { - private static List> SUPPORTED_PROPERTY_TYPES = Arrays.asList(new Class[] { + private static final List> SUPPORTED_PROPERTY_TYPES = Arrays.asList(new Class[] { Boolean.class, Byte.class, Double.class, Float.class, Integer.class, Long.class, Short.class, String.class }); diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java index 3aa6bfb3dc..30b302e600 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java @@ -1036,7 +1036,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp } return reply; } - catch (JMSException e) { + catch (JMSException e) { // NOSONAR - exception as flow control exception = e; if (logger.isDebugEnabled()) { logger.debug("Connection lost waiting for reply, retrying: " + e.getMessage()); @@ -1047,7 +1047,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp consumerSession = createSession(consumerConnection); break; } - catch (JMSException ee) { + catch (JMSException ee) { // NOSONAR - exception as flow control exception = ee; if (logger.isDebugEnabled()) { logger.debug("Could not reconnect, retrying: " + ee.getMessage()); @@ -1073,7 +1073,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp } } finally { - if (consumerSession != session) { + if (!consumerSession.equals(session)) { JmsUtils.closeSession(consumerSession); JmsUtils.closeConnection(consumerConnection); } diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSourceFactory.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSourceFactory.java index 6b31792918..1b08ec9235 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSourceFactory.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSourceFactory.java @@ -47,8 +47,7 @@ public class BeanPropertyParameterSourceFactory implements ParameterSourceFactor @Override public ParameterSource createParameterSource(Object input) { - ParameterSource toReturn = new StaticBeanPropertyParameterSource(input, this.staticParameters); - return toReturn; + return new StaticBeanPropertyParameterSource(input, this.staticParameters); } private static final class StaticBeanPropertyParameterSource implements diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueInboundGateway.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueInboundGateway.java index 287863af8a..0f0e00bcb0 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueInboundGateway.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueInboundGateway.java @@ -319,7 +319,8 @@ public class RedisQueueInboundGateway extends MessagingGatewaySupport implements @Override protected void doStop() { super.doStop(); - this.active = this.listening = false; + this.active = false; + this.listening = false; } public boolean isListening() { 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 dafcbd5e94..b940941ac2 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 @@ -239,7 +239,8 @@ public abstract class AbstractStompSessionManager implements StompSessionManager private void scheduleReconnect(Throwable e) { this.epoch.incrementAndGet(); - this.connecting = this.connected = false; + this.connecting = false; + this.connected = false; if (e != null) { this.logger.error("STOMP connect error for " + this, e); } diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/SyslogHeaders.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/SyslogHeaders.java index 07bbf63981..32a7248503 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/SyslogHeaders.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/SyslogHeaders.java @@ -31,7 +31,7 @@ public final class SyslogHeaders { super(); } - public static String PREFIX = "syslog_"; + public static final String PREFIX = "syslog_"; public static final String FACILITY = PREFIX + SyslogToMapTransformer.FACILITY; diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/RFC6587SyslogDeserializer.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/RFC6587SyslogDeserializer.java index a129c5007f..71b6387997 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/RFC6587SyslogDeserializer.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/RFC6587SyslogDeserializer.java @@ -106,9 +106,10 @@ public class RFC6587SyslogDeserializer implements Deserializer> { private int calculateLength(DataInputStream stream, int peek) throws IOException { int length = peek & 0xf; - int c; - while (isDigit((c = stream.read()))) { + int c = stream.read(); + while (isDigit(c)) { length = length * 10 + (c & 0xf); + c = stream.read(); } return length; } diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/SocketUtils.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/SocketUtils.java index bad06ba776..fc04c6da16 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/SocketUtils.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/SocketUtils.java @@ -16,6 +16,7 @@ package org.springframework.integration.test.util; +import java.io.IOException; import java.net.DatagramSocket; import java.net.InetAddress; import java.net.ServerSocket; @@ -112,7 +113,8 @@ public final class SocketUtils { } } - catch (Exception e) { + catch (@SuppressWarnings("unused") IOException e) { + // empty } } @@ -173,7 +175,11 @@ public final class SocketUtils { } } - catch (Exception e) { + catch (@SuppressWarnings("unused") IOException e) { + // empty + } + catch (@SuppressWarnings("unused") InterruptedException e) { + Thread.currentThread().interrupt(); } }