From 020aa019a1fe5bbdf280a440082c775f304514a9 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 7 Apr 2016 09:01:17 -0400 Subject: [PATCH] Sonar Fixes after Checkstyle Updates https://sonar.spring.io/issues/search#componentRoots=org.springframework.integration%3Aspring-integration|createdAt=2016-04-07T03%3A04%3A31%2B0000|sort=UPDATE_DATE|asc=false --- .../AbstractPersistentAcceptOnceFileListFilter.java | 8 +++----- .../springframework/integration/jms/JmsHeaderMapper.java | 2 +- .../integration/xmpp/core/XmppContextUtils.java | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java index 361f047de7..587d857de5 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java @@ -80,11 +80,9 @@ public abstract class AbstractPersistentAcceptOnceFileListFilter extends Abst return true; } // same value in store - if (!isEqual(file, oldValue)) { - if (this.store.replace(key, oldValue, newValue)) { - flushIfNeeded(); - return true; - } + if (!isEqual(file, oldValue) && this.store.replace(key, oldValue, newValue)) { + flushIfNeeded(); + return true; } return false; } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java index 3d93b1a579..5989ad6784 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java @@ -31,7 +31,7 @@ import org.springframework.integration.mapping.HeaderMapper; */ public abstract class JmsHeaderMapper implements HeaderMapper { - String CONTENT_TYPE_PROPERTY = "content_type"; + protected final static String CONTENT_TYPE_PROPERTY = "content_type"; } diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java index 429a46c484..595e3eb911 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java @@ -23,11 +23,10 @@ package org.springframework.integration.xmpp.core; */ public final class XmppContextUtils { + public static final String XMPP_CONNECTION_BEAN_NAME = "xmppConnection"; private XmppContextUtils() { super(); } - public static String XMPP_CONNECTION_BEAN_NAME = "xmppConnection"; - }