Add support for jakarta mail 2.0 (issue #317)

- Pulled from https://github.com/uberskigeek/greenmail/commits/317_jakarta_mail_2.0 - Rebased on master - Updated to latest JakartaMail 2.0 - Update GreenMail version to 2.0.0-SNAPSHOT
greenmail-mail-test · Jun 13, 2021 · 3342a03 · 3342a03
1 parent 5604a91
commit 3342a03
Show file tree

Hide file tree

Showing 100 changed files with 298 additions and 296 deletions.
diff --git a/greenmail-core/pom.xml b/greenmail-core/pom.xml
@@ -8,12 +8,12 @@
 
   <artifactId>greenmail</artifactId>
   <packaging>jar</packaging>
-  <version>1.6.5-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 
   <parent>
     <groupId>com.icegreen</groupId>
     <artifactId>greenmail-parent</artifactId>
-    <version>1.6.5-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/base/GreenMailOperations.java b/greenmail-core/src/main/java/com/icegreen/greenmail/base/GreenMailOperations.java
@@ -9,7 +9,7 @@
 import com.icegreen.greenmail.user.GreenMailUser;
 import com.icegreen.greenmail.user.UserManager;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 import java.util.Properties;
 
 /**

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapResponse.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapResponse.java
@@ -11,7 +11,7 @@
 import com.icegreen.greenmail.util.EncodingUtil;
 import com.icegreen.greenmail.util.InternetPrintWriter;
 
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 import java.io.OutputStream;
 
 /**

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapServer.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapServer.java
@@ -12,7 +12,7 @@
 import com.icegreen.greenmail.util.ServerSetup;
 import com.sun.mail.imap.IMAPStore; // NOSONAR
 
-import javax.mail.NoSuchProviderException;
+import jakarta.mail.NoSuchProviderException;
 import java.net.Socket;
 
 public final class ImapServer extends AbstractServer {
@@ -30,4 +30,4 @@ protected ProtocolHandler createProtocolHandler(Socket clientSocket) {
     public IMAPStore createStore() throws NoSuchProviderException {
         return (IMAPStore) super.createStore();
     }
-}
+}
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java
@@ -7,12 +7,12 @@
 package com.icegreen.greenmail.imap;
 
 import java.util.*;
-import javax.mail.Flags;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.UIDFolder;
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.SearchTerm;
+import jakarta.mail.Flags;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.UIDFolder;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.search.SearchTerm;
 
 import com.icegreen.greenmail.foedus.util.MsgRangeFilter;
 import com.icegreen.greenmail.imap.commands.IdRange;

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionImpl.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionImpl.java
@@ -12,7 +12,7 @@
 import com.icegreen.greenmail.user.GreenMailUser;
 import com.icegreen.greenmail.user.UserManager;
 
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 import java.util.List;
 
 /**

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/AppendCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/AppendCommand.java
@@ -14,8 +14,8 @@
 import com.icegreen.greenmail.store.MailFolder;
 import com.icegreen.greenmail.util.GreenMailUtil;
 
-import javax.mail.Flags;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Flags;
+import jakarta.mail.internet.MimeMessage;
 import java.io.ByteArrayInputStream;
 import java.util.Date;
 

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/CommandParser.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/CommandParser.java
@@ -13,7 +13,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 
 import com.icegreen.greenmail.imap.ImapConstants;
 import com.icegreen.greenmail.imap.ImapRequestLineReader;

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/FetchCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/FetchCommand.java
@@ -12,12 +12,12 @@
 import com.icegreen.greenmail.store.StoredMessage;
 import com.icegreen.greenmail.util.GreenMailUtil;
 
-import javax.mail.BodyPart;
-import javax.mail.Flags;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.mail.BodyPart;
+import jakarta.mail.Flags;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.*;

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/IdleCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/IdleCommand.java
@@ -2,7 +2,7 @@
 
 import java.net.SocketTimeoutException;
 
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 
 import com.icegreen.greenmail.imap.AuthorizationException;
 import com.icegreen.greenmail.imap.ImapRequestLineReader;

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaCommand.java
@@ -1,6 +1,6 @@
 package com.icegreen.greenmail.imap.commands;
 
-import javax.mail.Quota;
+import jakarta.mail.Quota;
 
 import com.icegreen.greenmail.imap.AuthorizationException;
 import com.icegreen.greenmail.imap.ImapRequestLineReader;
@@ -106,4 +106,4 @@ protected void appendQuotaRootName(Quota quota, StringBuilder buf) {
 
       Example:    S: * NAME "" (STORAGE 10 512)
 
-*/
+*/
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaRootCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaRootCommand.java
@@ -1,6 +1,6 @@
 package com.icegreen.greenmail.imap.commands;
 
-import javax.mail.Quota;
+import jakarta.mail.Quota;
 
 import com.icegreen.greenmail.imap.AuthorizationException;
 import com.icegreen.greenmail.imap.ImapRequestLineReader;
@@ -78,4 +78,4 @@ protected void doProcess(final ImapRequestLineReader request, final ImapResponse
       Example:    S: * QUOTAROOT INBOX ""
                   S: * QUOTAROOT comp.mail.mime
 
-*/
+*/
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommand.java
@@ -7,7 +7,7 @@
 package com.icegreen.greenmail.imap.commands;
 
 import java.nio.charset.UnsupportedCharsetException;
-import javax.mail.search.SearchTerm;
+import jakarta.mail.search.SearchTerm;
 
 import com.icegreen.greenmail.imap.ImapRequestLineReader;
 import com.icegreen.greenmail.imap.ImapResponse;

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommandParser.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommandParser.java
@@ -10,10 +10,10 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.*;
-import javax.mail.search.AndTerm;
-import javax.mail.search.NotTerm;
-import javax.mail.search.OrTerm;
-import javax.mail.search.SearchTerm;
+import jakarta.mail.search.AndTerm;
+import jakarta.mail.search.NotTerm;
+import jakarta.mail.search.OrTerm;
+import jakarta.mail.search.SearchTerm;
 
 import com.icegreen.greenmail.imap.ImapRequestLineReader;
 import com.icegreen.greenmail.imap.ProtocolException;

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchTermBuilder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchTermBuilder.java
@@ -9,25 +9,25 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.mail.Flags;
-import javax.mail.Message;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.search.AndTerm;
-import javax.mail.search.BodyTerm;
-import javax.mail.search.ComparisonTerm;
-import javax.mail.search.FlagTerm;
-import javax.mail.search.FromStringTerm;
-import javax.mail.search.FromTerm;
-import javax.mail.search.HeaderTerm;
-import javax.mail.search.OrTerm;
-import javax.mail.search.ReceivedDateTerm;
-import javax.mail.search.RecipientStringTerm;
-import javax.mail.search.RecipientTerm;
-import javax.mail.search.SearchTerm;
-import javax.mail.search.SentDateTerm;
-import javax.mail.search.SizeTerm;
-import javax.mail.search.SubjectTerm;
+import jakarta.mail.Flags;
+import jakarta.mail.Message;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.search.AndTerm;
+import jakarta.mail.search.BodyTerm;
+import jakarta.mail.search.ComparisonTerm;
+import jakarta.mail.search.FlagTerm;
+import jakarta.mail.search.FromStringTerm;
+import jakarta.mail.search.FromTerm;
+import jakarta.mail.search.HeaderTerm;
+import jakarta.mail.search.OrTerm;
+import jakarta.mail.search.ReceivedDateTerm;
+import jakarta.mail.search.RecipientStringTerm;
+import jakarta.mail.search.RecipientTerm;
+import jakarta.mail.search.SearchTerm;
+import jakarta.mail.search.SentDateTerm;
+import jakarta.mail.search.SizeTerm;
+import jakarta.mail.search.SubjectTerm;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -355,7 +355,7 @@ public SearchTerm build() {
 
     private static SearchTerm createFlagSearchTerm(String flagName, boolean value) {
         Flags.Flag flag = toFlag(flagName);
-        Flags flags = new javax.mail.Flags();
+        Flags flags = new jakarta.mail.Flags();
         if (null == flag) { // user flags
             flags.add(flagName);
         } else {
@@ -384,28 +384,28 @@ public SearchTerm build() {
         };
     }
 
-    private static javax.mail.Flags.Flag toFlag(String flagValue) {
+    private static jakarta.mail.Flags.Flag toFlag(String flagValue) {
         if (flagValue == null || flagValue.trim().length() < 1) {
             throw new IllegalArgumentException("Can not convert empty string to mail flag");
         }
         String flag = flagValue.trim().toUpperCase();
         if ("ANSWERED".equals(flag)) {
-            return javax.mail.Flags.Flag.ANSWERED;
+            return jakarta.mail.Flags.Flag.ANSWERED;
         }
         if ("DELETED".equals(flag)) {
-            return javax.mail.Flags.Flag.DELETED;
+            return jakarta.mail.Flags.Flag.DELETED;
         }
         if ("DRAFT".equals(flag)) {
-            return javax.mail.Flags.Flag.DRAFT;
+            return jakarta.mail.Flags.Flag.DRAFT;
         }
         if ("FLAGGED".equals(flag)) {
-            return javax.mail.Flags.Flag.FLAGGED;
+            return jakarta.mail.Flags.Flag.FLAGGED;
         }
         if ("RECENT".equals(flag)) {
-            return javax.mail.Flags.Flag.RECENT;
+            return jakarta.mail.Flags.Flag.RECENT;
         }
         if ("SEEN".equals(flag)) {
-            return javax.mail.Flags.Flag.SEEN;
+            return jakarta.mail.Flags.Flag.SEEN;
         }
         return null;
     }

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SetQuotaCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SetQuotaCommand.java
@@ -1,6 +1,6 @@
 package com.icegreen.greenmail.imap.commands;
 
-import javax.mail.Quota;
+import jakarta.mail.Quota;
 
 import com.icegreen.greenmail.imap.ImapRequestLineReader;
 import com.icegreen.greenmail.imap.ImapResponse;

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SortTerm.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SortTerm.java
@@ -1,6 +1,6 @@
 package com.icegreen.greenmail.imap.commands;
 
-import javax.mail.search.SearchTerm;
+import jakarta.mail.search.SearchTerm;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoreCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoreCommand.java
@@ -10,7 +10,7 @@
 import com.icegreen.greenmail.store.FolderException;
 import com.icegreen.greenmail.store.FolderListener;
 
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 
 
 /**

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoredMessageSorter.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoredMessageSorter.java
@@ -2,9 +2,9 @@
 
 import com.icegreen.greenmail.store.StoredMessage;
 
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
 import java.util.Comparator;
 import java.util.concurrent.atomic.AtomicBoolean;
 

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MailAddress.java b/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MailAddress.java
@@ -7,8 +7,8 @@
 package com.icegreen.greenmail.mail;
 
 import java.io.UnsupportedEncodingException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeUtility;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeUtility;
 
 public class MailAddress {
     String host;
@@ -73,4 +73,4 @@ private String decodeStr(String str) {
             return str;
         }
     }
-}
+}
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MovingMessage.java b/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MovingMessage.java
@@ -6,7 +6,7 @@
  */
 package com.icegreen.greenmail.mail;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 import java.util.LinkedList;
 import java.util.List;
 

diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/Pop3Server.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/Pop3Server.java
@@ -13,7 +13,7 @@
 import com.icegreen.greenmail.util.ServerSetup;
 import com.sun.mail.pop3.POP3Store; // NOSONAR
 
-import javax.mail.NoSuchProviderException;
+import jakarta.mail.NoSuchProviderException;
 import java.net.Socket;
 
 public class Pop3Server extends AbstractServer {
@@ -31,4 +31,4 @@ protected ProtocolHandler createProtocolHandler(final Socket clientSocket) {
     public POP3Store createStore() throws NoSuchProviderException {
         return (POP3Store) super.createStore();
     }
-}
+}
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/DeleCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/DeleCommand.java
@@ -12,7 +12,7 @@
 import com.icegreen.greenmail.store.MailFolder;
 import com.icegreen.greenmail.store.StoredMessage;
 
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 import java.util.List;
 
 
@@ -52,4 +52,4 @@ public void execute(Pop3Connection conn, Pop3State state,
             conn.println("-ERR " + e);
         }
     }
-}
+}
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RetrCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RetrCommand.java
@@ -13,7 +13,7 @@
 import com.icegreen.greenmail.store.StoredMessage;
 import com.icegreen.greenmail.util.GreenMailUtil;
 
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 import java.io.StringReader;
 import java.util.List;
 
@@ -52,4 +52,4 @@ public void execute(Pop3Connection conn, Pop3State state,
             conn.println("-ERR " + e);
         }
     }
-}
+}
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RsetCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RsetCommand.java
@@ -5,7 +5,7 @@
 import com.icegreen.greenmail.store.MailFolder;
 import com.icegreen.greenmail.store.StoredMessage;
 
-import javax.mail.Flags;
+import jakarta.mail.Flags;
 import java.util.List;
 
 /**