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

Start 6.0 version

Browse Source 
* Upgrade to Java 17, SF-6.0, Gradle 7.2
* Upgrade to Jakarta dependencies and respective namespaces
* Fix some tests for Java 17 compatibility
* Fix wrong Javadocs
* Add some missed Javadocs
* Fix more `jakarta` namespace
* Fix WS & XML modules to use Jakarta EE
* `--add-opens` in some modules for their reflection-based tests
* Disable Kafka tests which does not work on Windows; see Apache Kafka `3.0.1`
* Upgrade to JUnit `5.8.1`
* Migrate JMS tests to Artemis
* Remove RMI module as it was deprecated before
* Fix `pr-build-workflow.yml` for Java 17
* Fix JavaDocs warnings using `Xdoclint:syntax` per module, not in the top-level `api` task
* Move docs for version `6.0`
This commit is contained in:
Artem Bilan
2021-11-03 09:38:10 -04:00
parent 4423e43cd8
commit a80b22638d
225 changed files with 2196 additions and 2628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,21 +45,21 @@ import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.LogRecord;
import javax.mail.Flags;
import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.FolderClosedException;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Store;
import javax.mail.URLName;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.mail.search.AndTerm;
import javax.mail.search.FlagTerm;
import javax.mail.search.FromTerm;
import jakarta.mail.Flags;
import jakarta.mail.Flags.Flag;
import jakarta.mail.Folder;
import jakarta.mail.FolderClosedException;
import jakarta.mail.Message;
import jakarta.mail.MessagingException;
import jakarta.mail.Multipart;
import jakarta.mail.Store;
import jakarta.mail.URLName;
import jakarta.mail.internet.AddressException;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import jakarta.mail.search.AndTerm;
import jakarta.mail.search.FlagTerm;
import jakarta.mail.search.FromTerm;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -797,7 +797,7 @@ public class ImapMailReceiverTests {
try {
receiver.receive();
}
catch (javax.mail.MessagingException e) {
catch (jakarta.mail.MessagingException e) {
if (e.getCause() instanceof NullPointerException) {
failed.getAndIncrement();
}

14
spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailSearchTermsTests.java
View File

@@ -24,13 +24,13 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import javax.mail.Flags;
import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.search.AndTerm;
import javax.mail.search.FlagTerm;
import javax.mail.search.NotTerm;
import javax.mail.search.SearchTerm;
import jakarta.mail.Flags;
import jakarta.mail.Flags.Flag;
import jakarta.mail.Folder;
import jakarta.mail.search.AndTerm;
import jakarta.mail.search.FlagTerm;
import jakarta.mail.search.NotTerm;
import jakarta.mail.search.SearchTerm;
import org.junit.jupiter.api.Test;

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

@@ -26,11 +26,11 @@ import static org.mockito.Mockito.when;
import java.util.Properties;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.Session;
import javax.mail.Store;
import javax.mail.URLName;
import jakarta.mail.Folder;
import jakarta.mail.Message;
import jakarta.mail.Session;
import jakarta.mail.Store;
import jakarta.mail.URLName;
import org.junit.jupiter.api.Test;

12
spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceivingMessageSourceTests.java
View File

@@ -21,8 +21,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import javax.mail.Message;
import javax.mail.internet.MimeMessage;
import jakarta.mail.Message;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -43,9 +43,9 @@ public class MailReceivingMessageSourceTests {
MimeMessage message3 = Mockito.mock(MimeMessage.class);
MimeMessage message4 = Mockito.mock(MimeMessage.class);
mailReceiver.messages.add(new javax.mail.Message[]{ message1 });
mailReceiver.messages.add(new javax.mail.Message[]{ message2, message3 });
mailReceiver.messages.add(new javax.mail.Message[]{ message4 });
mailReceiver.messages.add(new jakarta.mail.Message[]{ message1 });
mailReceiver.messages.add(new jakarta.mail.Message[]{ message2, message3 });
mailReceiver.messages.add(new jakarta.mail.Message[]{ message4 });
MailReceivingMessageSource source = new MailReceivingMessageSource(mailReceiver);
assertThat(source.receive().getPayload()).as("Wrong message for number 1").isEqualTo(message1);
@@ -66,7 +66,7 @@ public class MailReceivingMessageSourceTests {
}
@Override
public javax.mail.Message[] receive() {
public jakarta.mail.Message[] receive() {
return messages.poll();
}

4
spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests-context.xml
View File

@@ -9,8 +9,8 @@
<bean id="javaMailSender" class="org.springframework.integration.mail.StubJavaMailSender">
<constructor-arg>
<bean class="javax.mail.internet.MimeMessage">
<constructor-arg type="javax.mail.Session">
<bean class="jakarta.mail.internet.MimeMessage">
<constructor-arg type="jakarta.mail.Session">
<null/>
</constructor-arg>
</bean>

6
spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java
View File

@@ -21,9 +21,9 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import java.io.DataInputStream;
import javax.mail.Message;
import javax.mail.Multipart;
import javax.mail.internet.MimeMessage;
import jakarta.mail.Message;
import jakarta.mail.Multipart;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

8
spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java
View File

@@ -20,10 +20,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.DataInputStream;
import javax.mail.Message;
import javax.mail.Multipart;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import jakarta.mail.Message;
import jakarta.mail.Multipart;
import jakarta.mail.Session;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;

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

@@ -25,11 +25,11 @@ import static org.mockito.Mockito.when;
import java.lang.reflect.Field;
import javax.mail.Flags;
import javax.mail.Flags.Flag;
import javax.mail.Folder;
import javax.mail.Message;
import javax.mail.internet.MimeMessage;
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;

2
spring-integration-mail/src/test/java/org/springframework/integration/mail/StubJavaMailSender.java
View File

@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.mail.internet.MimeMessage;
import jakarta.mail.internet.MimeMessage;
import org.springframework.mail.MailException;
import org.springframework.mail.SimpleMailMessage;

4
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/DefaultConfigurationTests-context.xml
View File

@@ -11,8 +11,8 @@
<bean id="mailSender" class="org.springframework.integration.mail.StubJavaMailSender">
<constructor-arg>
<bean class="javax.mail.internet.MimeMessage">
<constructor-arg type="javax.mail.Session"><null/></constructor-arg>
<bean class="jakarta.mail.internet.MimeMessage">
<constructor-arg type="jakarta.mail.Session"><null/></constructor-arg>
</bean>
</constructor-arg>
</bean>

8
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java
View File

@@ -20,10 +20,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
import javax.mail.Flags;
import javax.mail.Folder;
import javax.mail.URLName;
import javax.mail.search.SearchTerm;
import jakarta.mail.Flags;
import jakarta.mail.Folder;
import jakarta.mail.URLName;
import jakarta.mail.search.SearchTerm;
import org.junit.jupiter.api.Test;

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

@@ -29,8 +29,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.mail.Folder;
import javax.mail.Message;
import jakarta.mail.Folder;
import jakarta.mail.Message;
import org.junit.jupiter.api.Test;

2
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests-context.xml
View File

@@ -113,7 +113,7 @@
store-uri="imap:test" session="testSession" channel="testChannel"
should-delete-messages="false" auto-startup="false" />
<bean id="testSession" class="javax.mail.Session" factory-method="getInstance">
<bean id="testSession" class="jakarta.mail.Session" factory-method="getInstance">
<constructor-arg>
<props>
<prop key="foo">bar</prop>

2
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.integration.mail.config;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import javax.mail.Authenticator;
import jakarta.mail.Authenticator;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXParseException;

6
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.integration.mail.config;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import javax.mail.internet.MimeMessage;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -49,7 +49,7 @@ class MailToStringTransformerParserTests {
(PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
MimeMessage mimeMessage = Mockito.mock(MimeMessage.class);
Mockito.when(mimeMessage.getContent()).thenReturn("hello");
input.send(new GenericMessage<javax.mail.Message>(mimeMessage));
input.send(new GenericMessage<jakarta.mail.Message>(mimeMessage));
Message<?> result = output.receive(10_000);
assertThat(result).isNotNull();
assertThat(result.getPayload()).isEqualTo("hello");
@@ -67,7 +67,7 @@ class MailToStringTransformerParserTests {
(PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
MimeMessage mimeMessage = Mockito.mock(MimeMessage.class);
Mockito.when(mimeMessage.getContent()).thenReturn("foo");
input.send(new GenericMessage<javax.mail.Message>(mimeMessage));
input.send(new GenericMessage<jakarta.mail.Message>(mimeMessage));
Message<?> result = output.receive(0);
assertThat(result).isNotNull();
assertThat(result.getPayload()).isEqualTo("FOO!!!");

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

@@ -27,8 +27,8 @@ import java.io.FileReader;
import java.io.StringWriter;
import java.util.Properties;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import jakarta.mail.Session;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

2
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests.java
View File

@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Properties;
import javax.mail.URLName;
import jakarta.mail.URLName;
import org.junit.jupiter.api.Test;

6
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/Pop3Tests.java
View File

@@ -20,9 +20,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import javax.mail.Message.RecipientType;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import jakarta.mail.Message.RecipientType;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;

6
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java
View File

@@ -18,9 +18,9 @@ package org.springframework.integration.mail.config;
import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.Message.RecipientType;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import jakarta.mail.Message.RecipientType;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;

4
spring-integration-mail/src/test/java/org/springframework/integration/mail/config/mailOutboundChannelAdapterParserTests.xml
View File

@@ -26,8 +26,8 @@
<bean id="mailSender" class="org.springframework.integration.mail.StubJavaMailSender">
<constructor-arg>
<bean class="javax.mail.internet.MimeMessage">
<constructor-arg type="javax.mail.Session"><null/></constructor-arg>
<bean class="jakarta.mail.internet.MimeMessage">
<constructor-arg type="jakarta.mail.Session"><null/></constructor-arg>
</bean>
</constructor-arg>
</bean>

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

@@ -21,16 +21,16 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.Closeable;
import java.util.Properties;
import javax.mail.Flags;
import javax.mail.Folder;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMessage.RecipientType;
import javax.mail.search.AndTerm;
import javax.mail.search.FlagTerm;
import javax.mail.search.FromTerm;
import javax.mail.search.SearchTerm;
import jakarta.mail.Flags;
import jakarta.mail.Folder;
import jakarta.mail.internet.AddressException;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import jakarta.mail.internet.MimeMessage.RecipientType;
import jakarta.mail.search.AndTerm;
import jakarta.mail.search.FlagTerm;
import jakarta.mail.search.FromTerm;
import jakarta.mail.search.SearchTerm;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;