Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

checkstyle FinalClassCheck

Browse Source 
fixes

fixModifiers after fixFinal

Revert CachingSessionFactory

Class is spied in tests.

checkstyle - Import Rules

checkstyle InterfaceIsType

checkstyle InnerTypeLast

checkstyle OneStatementPerLine

CovariantEquals
OneTopLevelClass

* Revert `'\n'` -> `System.lineSeparator()` in the Gradle scripts to meet Git `autocrlf = true` on Windows
* Fix timing issue with the `LastModifiedFileListFilterTests`, when the `age = 1` might not be enough for the file object when we have some delay before checking
This commit is contained in:
Gary Russell
2016-04-02 10:52:19 -04:00
committed by Artem Bilan
parent 43af472c3a
commit 4ac3a79df7
105 changed files with 752 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java
View File

@@ -25,11 +25,10 @@ package org.springframework.integration.xmpp;
* @author Oleg Zhurakousky
* @since 2.0
*/
public class XmppHeaders {
public final class XmppHeaders {
private XmppHeaders() {
super();
// TODO Auto-generated constructor stub
}
public static final String PREFIX = "xmpp_";

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

@@ -18,10 +18,16 @@ package org.springframework.integration.xmpp.core;
/**
* @author Oleg ZHurakousky
* @author Gary Russell
* @since 2.0
*/
public interface XmppContextUtils {
public final class XmppContextUtils {
String XMPP_CONNECTION_BEAN_NAME = "xmppConnection";
private XmppContextUtils() {
super();
}
public static String XMPP_CONNECTION_BEAN_NAME = "xmppConnection";
}

4
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java
View File

@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
*/
public class ChatMessageSendingMessageHandler extends AbstractXmppConnectionAwareMessageHandler {
private static final Pattern xmlPattern = Pattern.compile("<(\\S[^>\\s]*)[^>]*>[^<]*</\\1>");
private static final Pattern XML_PATTERN = Pattern.compile("<(\\S[^>\\s]*)[^>]*>[^<]*</\\1>");
private volatile XmppHeaderMapper headerMapper = new DefaultXmppHeaderMapper();
@@ -101,7 +101,7 @@ public class ChatMessageSendingMessageHandler extends AbstractXmppConnectionAwar
else if (payload instanceof String) {
if (this.extensionProvider != null) {
String data = (String) payload;
if (!xmlPattern.matcher(data.trim()).matches()) {
if (!XML_PATTERN.matcher(data.trim()).matches()) {
// Since XMPP Extension parsers deal only with XML content,
// add an arbitrary tag that is removed by the extension parser,
// if the target content isn't XML.