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

Author: garyrussell

spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java

@@ -80,11 +80,9 @@ protected boolean accept(F file) {
 				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;
 		}

spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java

@@ -31,7 +31,7 @@
  */
 public abstract class JmsHeaderMapper implements HeaderMapper<Message> {
 
-	String CONTENT_TYPE_PROPERTY = "content_type";
+	protected final static String CONTENT_TYPE_PROPERTY = "content_type";
 
 }
 

spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java

@@ -23,11 +23,10 @@
  */
 public final class XmppContextUtils {
 
+	public static final String XMPP_CONNECTION_BEAN_NAME = "xmppConnection";
 
 	private XmppContextUtils() {
 		super();
 	}
 
-	public static String XMPP_CONNECTION_BEAN_NAME = "xmppConnection";
-
 }