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

Upgrade to Jakarta EE 10

Browse Source 
* Fix mail module to fit to the latest mail API requirements
* Fix the last Sonar smell in the `SmbShare`
* Remove redundant dependency for `hamcrest-core` in various modules
This commit is contained in:
Artem Bilan
2022-11-07 17:04:14 -05:00
parent 053c86ab05
commit 60f453e9ff
4 changed files with 73 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -270,8 +270,8 @@ public class ImapMailReceiverTests {
user.deliver(GreenMailUtil.createTextEmail("user", "sender", "subject", "body",
imapIdleServer.getImap().getServerSetup()));
AbstractMailReceiver receiver = new ImapMailReceiver();
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
receiver = receiveAndMarkAsReadDontDeleteGuts(receiver, msg1, msg2);
verify(msg1, times(1)).setFlag(Flag.SEEN, true);
verify(msg2, times(1)).setFlag(Flag.SEEN, true);
@@ -310,11 +310,11 @@ public class ImapMailReceiverTests {
return receiver;
}
@Test // INT-2991 Flag.SEEN was set twice when a filter is used
@Test
public void receiveAndMarkAsReadDontDeletePassingFilter() throws Exception {
AbstractMailReceiver receiver = new ImapMailReceiver();
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
Expression selectorExpression = new SpelExpressionParser().parseExpression("true");
receiver.setSelectorExpression(selectorExpression);
receiver = receiveAndMarkAsReadDontDeleteGuts(receiver, msg1, msg2);
@@ -323,11 +323,11 @@ public class ImapMailReceiverTests {
verify(receiver, times(0)).deleteMessages(Mockito.any());
}
@Test // INT-2991 filtered messages were marked SEEN
@Test
public void receiveAndMarkAsReadDontDeleteFiltered() throws Exception {
AbstractMailReceiver receiver = new ImapMailReceiver();
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
given(msg2.getSubject()).willReturn("foo"); // should not be marked seen
Expression selectorExpression = new SpelExpressionParser()
.parseExpression("subject == null OR !subject.equals('foo')");
@@ -401,8 +401,8 @@ public class ImapMailReceiverTests {
given(folder.getPermanentFlags()).willReturn(new Flags(Flags.Flag.USER));
folderField.set(receiver, folder);
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages = new Message[]{ msg1, msg2 };
willAnswer(invocation -> {
DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock());
@@ -437,8 +437,8 @@ public class ImapMailReceiverTests {
folderField.set(receiver, folder);
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages = new Message[]{ msg1, msg2 };
willAnswer(invocation -> null).given(receiver).openFolder();
@@ -466,8 +466,8 @@ public class ImapMailReceiverTests {
given(folder.getPermanentFlags()).willReturn(new Flags(Flags.Flag.USER));
folderField.set(receiver, folder);
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages = new Message[]{ msg1, msg2 };
willAnswer(invocation -> {
DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock());
@@ -502,8 +502,8 @@ public class ImapMailReceiverTests {
given(folder.getPermanentFlags()).willReturn(new Flags(Flags.Flag.USER));
folderField.set(receiver, folder);
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages = new Message[]{ msg1, msg2 };
willAnswer(invocation -> {
DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock());
@@ -536,7 +536,7 @@ public class ImapMailReceiverTests {
DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter);
adapterAccessor.setPropertyValue("mailReceiver", receiver);
MimeMessage mailMessage = mock(MimeMessage.class);
Message mailMessage = spy(GreenMailUtil.newMimeMessage("test1"));
Flags flags = mock(Flags.class);
given(mailMessage.getFlags()).willReturn(flags);
final Message[] messages = new Message[]{ mailMessage };
@@ -604,7 +604,7 @@ public class ImapMailReceiverTests {
DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter);
adapterAccessor.setPropertyValue("mailReceiver", receiver);
MimeMessage mailMessage = mock(MimeMessage.class);
Message mailMessage = spy(GreenMailUtil.newMimeMessage("test1"));
Flags flags = mock(Flags.class);
given(mailMessage.getFlags()).willReturn(flags);
final Message[] messages = new Message[]{ mailMessage };
@@ -651,7 +651,7 @@ public class ImapMailReceiverTests {
willAnswer(invocation -> folder).given(receiver).getFolder();
MimeMessage mailMessage = mock(MimeMessage.class);
Message mailMessage = spy(GreenMailUtil.newMimeMessage("test1"));
Flags flags = mock(Flags.class);
given(mailMessage.getFlags()).willReturn(flags);
final Message[] messages = new Message[]{ mailMessage };
@@ -724,7 +724,7 @@ public class ImapMailReceiverTests {
willAnswer(invocation -> folder).given(receiver).getFolder();
MimeMessage mailMessage = mock(MimeMessage.class);
Message mailMessage = spy(GreenMailUtil.newMimeMessage("test1"));
Flags flags = mock(Flags.class);
given(mailMessage.getFlags()).willReturn(flags);
final Message[] messages = new Message[]{ mailMessage };
@@ -864,7 +864,7 @@ public class ImapMailReceiverTests {
given(folder.exists()).willReturn(true);
given(folder.isOpen()).willReturn(true);
Message message = new MimeMessage(null, new ClassPathResource("test.mail").getInputStream());
Message message = GreenMailUtil.newMimeMessage(new ClassPathResource("test.mail").getInputStream());
given(folder.search(Mockito.any())).willReturn(new Message[]{ message });
given(store.getFolder(Mockito.any(URLName.class))).willReturn(folder);
given(folder.getPermanentFlags()).willReturn(new Flags(Flags.Flag.USER));
@@ -878,8 +878,8 @@ public class ImapMailReceiverTests {
@Test
public void testNullMessages() throws Exception {
Message message1 = mock(Message.class);
Message message2 = mock(Message.class);
Message message1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message message2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages1 = new Message[]{ null, null, message1 };
final Message[] messages2 = new Message[]{ message2 };
final SearchTermStrategy searchTermStrategy = mock(SearchTermStrategy.class);

30
spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,16 +29,18 @@ import jakarta.mail.Flags;
import jakarta.mail.Flags.Flag;
import jakarta.mail.Folder;
import jakarta.mail.Message;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.BeanFactory;
import com.icegreen.greenmail.util.GreenMailUtil;
/**
* @author Oleg Zhurakousky
* @author Gary Russell
* @author Artem Bilan
*
*/
public class Pop3MailReceiverTests {
@@ -57,9 +59,9 @@ public class Pop3MailReceiverTests {
when(folder.getPermanentFlags()).thenReturn(new Flags(Flags.Flag.USER));
folderField.set(receiver, folder);
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
final Message[] messages = new Message[] { msg1, msg2 };
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages = new Message[]{ msg1, msg2 };
doAnswer(invocation -> {
DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock());
int folderOpenMode = (Integer) accessor.getPropertyValue("folderOpenMode");
@@ -92,9 +94,9 @@ public class Pop3MailReceiverTests {
when(folder.getPermanentFlags()).thenReturn(new Flags(Flags.Flag.USER));
folderField.set(receiver, folder);
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
final Message[] messages = new Message[] { msg1, msg2 };
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages = new Message[]{ msg1, msg2 };
doAnswer(invocation -> null).when(receiver).openFolder();
doAnswer(invocation -> messages).when(receiver).searchForNewMessages();
@@ -119,9 +121,9 @@ public class Pop3MailReceiverTests {
when(folder.getPermanentFlags()).thenReturn(new Flags(Flags.Flag.USER));
folderField.set(receiver, folder);
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
final Message[] messages = new Message[] { msg1, msg2 };
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages = new Message[]{ msg1, msg2 };
doAnswer(invocation -> null).when(receiver).openFolder();
doAnswer(invocation -> messages).when(receiver).searchForNewMessages();
@@ -146,9 +148,9 @@ public class Pop3MailReceiverTests {
when(folder.getPermanentFlags()).thenReturn(new Flags(Flags.Flag.USER));
folderField.set(receiver, folder);
Message msg1 = mock(MimeMessage.class);
Message msg2 = mock(MimeMessage.class);
final Message[] messages = new Message[] { msg1, msg2 };
Message msg1 = spy(GreenMailUtil.newMimeMessage("test1"));
Message msg2 = spy(GreenMailUtil.newMimeMessage("test2"));
final Message[] messages = new Message[]{ msg1, msg2 };
doAnswer(invocation -> null).when(receiver).openFolder();
doAnswer(invocation -> messages).when(receiver).searchForNewMessages();