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

Enable ModifierOrderCheck Checkstyle rule (#2673)

Browse Source 
* Enable ModifierOrderCheck Checkstyle rule

* Fix violations for `static` and `abstract` modifier
* Remove redundant code in the `TcpNioConnection`
* Mark `connectionFactoryName` as `@Nullable` in the `TcpConnectionSupport`
ctor and its inheritors
* Fix some smells according IDEA suggestions in the affected classes
* This should fix some Sonar smells as well

* * Fix `HeaderMapperTests`

* * Polishing `TcpConnection` code style and fix Javdocs
This commit is contained in:
Artem Bilan
2018-12-20 19:19:47 -05:00
committed by Gary Russell
parent a01d09f0f1
commit 93d7c58b64
56 changed files with 633 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
View File

@@ -38,9 +38,6 @@ import javax.mail.Store;
import javax.mail.URLName;
import javax.mail.internet.MimeMessage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.support.StandardEvaluationContext;
@@ -68,9 +65,7 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl
* Default user flag for marking messages as seen by this receiver:
* {@value #DEFAULT_SI_USER_FLAG}.
*/
public final static String DEFAULT_SI_USER_FLAG = "spring-integration-mail-adapter";
protected final Log logger = LogFactory.getLog(getClass()); // NOSONAR safe to use final
public static final String DEFAULT_SI_USER_FLAG = "spring-integration-mail-adapter";
private final URLName url;
@@ -500,8 +495,8 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl
*/
private MimeMessage[] filterMessagesThruSelector(Message[] messages) throws MessagingException {
List<MimeMessage> filteredMessages = new LinkedList<>();
for (int i = 0; i < messages.length; i++) {
MimeMessage message = (MimeMessage) messages[i];
for (Message message1 : messages) {
MimeMessage message = (MimeMessage) message1;
if (this.selectorExpression != null) {
if (Boolean.TRUE.equals(
this.selectorExpression.getValue(this.evaluationContext, message, Boolean.class))) {
@@ -544,8 +539,8 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl
* @throws MessagingException in case of JavaMail errors
*/
protected void deleteMessages(Message[] messages) throws MessagingException {
for (int i = 0; i < messages.length; i++) {
messages[i].setFlag(Flags.Flag.DELETED, true);
for (Message message : messages) {
message.setFlag(Flags.Flag.DELETED, true);
}
}

4
spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java
View File

@@ -112,13 +112,13 @@ import com.sun.mail.imap.IMAPFolder;
@DirtiesContext
public class ImapMailReceiverTests {
private static final ImapServer imapIdleServer = TestMailServer.imap(0);
@Rule
public final LongRunningIntegrationTest longRunningIntegrationTest = new LongRunningIntegrationTest();
private final AtomicInteger failed = new AtomicInteger(0);
private final static ImapServer imapIdleServer = TestMailServer.imap(0);
@Autowired
private ApplicationContext context;

10
spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java
View File

@@ -79,13 +79,13 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@DirtiesContext
public class MailTests {
private final static SmtpServer smtpServer = TestMailServer.smtp(0);
private static final SmtpServer smtpServer = TestMailServer.smtp(0);
private final static Pop3Server pop3Server = TestMailServer.pop3(0);
private static final Pop3Server pop3Server = TestMailServer.pop3(0);
private final static ImapServer imapServer = TestMailServer.imap(0);
private static final ImapServer imapServer = TestMailServer.imap(0);
private final static ImapServer imapIdleServer = TestMailServer.imap(0);
private static final ImapServer imapIdleServer = TestMailServer.imap(0);
@BeforeClass
@@ -173,7 +173,7 @@ public class MailTests {
}
@Test
public void testImapIdle() throws Exception {
public void testImapIdle() {
Message<?> message = this.imapIdleChannel.receive(10000);
assertNotNull(message);
MessageHeaders headers = message.getHeaders();