solve some warnings

Author: bbottema

modules/core-module/src/main/java/org/simplejavamail/api/mailer/config/Pkcs12Config.java

@@ -5,7 +5,6 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;
 

modules/core-module/src/main/java/org/simplejavamail/internal/modules/BatchModule.java

@@ -5,7 +5,7 @@
 import org.simplejavamail.api.mailer.config.OperationalConfig;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+
 import javax.mail.Session;
 import javax.mail.Transport;
 import java.util.UUID;

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java

@@ -445,14 +445,14 @@ public static Address[] retrieveRecipients(@NotNull final MimeMessage mimeMessag
 		try {
 			// return mimeMessage.getRecipients(recipientType); // can fail in strict mode, see https://github.com/bbottema/simple-java-mail/issues/227
 			// workaround following (copied and modified from JavaMail internal code):
-			String s = mimeMessage.getHeader(getHeaderName(mimeMessage, recipientType), ",");
+			String s = mimeMessage.getHeader(getHeaderName(recipientType), ",");
 			return (s == null) ? null : InternetAddress.parseHeader(s, false);
 		} catch (final MessagingException e) {
 			throw new MimeMessageParseException(format(MimeMessageParseException.ERROR_GETTING_RECIPIENTS, recipientType), e);
 		}
 	}
 
-	private static String getHeaderName(@NotNull MimeMessage mimeMessage, RecipientType recipientType) throws MessagingException {
+	private static String getHeaderName(RecipientType recipientType) {
 		if (recipientType == RecipientType.TO) {
 			return "To";
 		} else if (recipientType == RecipientType.CC) {

modules/simple-java-mail/src/main/java/org/simplejavamail/internal/modules/ModuleLoader.java

@@ -23,6 +23,7 @@ public static void clearLoadedModules() {
 	public static AuthenticatedSocksModule loadAuthenticatedSocksModule() {
 		if (!LOADED_MODULES.containsKey(AuthenticatedSocksModule.class)) {
 			LOADED_MODULES.put(AuthenticatedSocksModule.class, loadModule(
+					AuthenticatedSocksModule.class,
 					"Authenticated Socks",
 					"org.simplejavamail.internal.authenticatedsockssupport.AuthenticatedSocksHelper",
 					"https://github.com/bbottema/simple-java-mail/tree/develop/modules/authenticated-socks-module"));
@@ -33,6 +34,7 @@ public static AuthenticatedSocksModule loadAuthenticatedSocksModule() {
 	public static DKIMModule loadDKIMModule() {
 		if (!LOADED_MODULES.containsKey(DKIMModule.class)) {
 			LOADED_MODULES.put(DKIMModule.class, loadModule(
+					DKIMModule.class,
 					"DKIM",
 					"org.simplejavamail.internal.dkimsupport.DKIMSigner",
 					"https://github.com/bbottema/simple-java-mail/tree/develop/modules/dkim-module"));
@@ -43,6 +45,7 @@ public static DKIMModule loadDKIMModule() {
 	public static OutlookModule loadOutlookModule() {
 		if (!LOADED_MODULES.containsKey(OutlookModule.class)) {
 			LOADED_MODULES.put(OutlookModule.class, loadModule(
+					OutlookModule.class,
 					"Outlook",
 					"org.simplejavamail.internal.outlooksupport.converter.OutlookEmailConverter",
 					"https://github.com/bbottema/simple-java-mail/tree/develop/modules/outlook-module"
@@ -54,6 +57,7 @@ public static OutlookModule loadOutlookModule() {
 	public static SMIMEModule loadSmimeModule() {
 		if (!LOADED_MODULES.containsKey(SMIMEModule.class)) {
 			LOADED_MODULES.put(SMIMEModule.class, loadModule(
+					SMIMEModule.class,
 					"S/MIME",
 					"org.simplejavamail.internal.smimesupport.SMIMESupport",
 					"https://github.com/bbottema/simple-java-mail/tree/develop/modules/smime-module"
@@ -65,6 +69,7 @@ public static SMIMEModule loadSmimeModule() {
 	public static BatchModule loadBatchModule() {
 		if (!LOADED_MODULES.containsKey(BatchModule.class)) {
 			LOADED_MODULES.put(BatchModule.class, loadModule(
+					BatchModule.class,
 					"Batch",
 					"org.simplejavamail.internal.batchsupport.BatchSupport",
 					"https://github.com/bbottema/simple-java-mail/tree/develop/modules/batch-module"
@@ -82,15 +87,15 @@ public static boolean smimeModuleAvailable() {
 	}
 
 	@SuppressWarnings("unchecked")
-	private static <T> T loadModule(String moduleName, String moduleClass, String moduleHome) {
+	private static <T> T loadModule(Class moduleClass,String moduleName, String moduleImplClassName, String moduleHome) {
 		try {
 			if (FORCED_DISABLED_MODULES.contains(moduleClass)) {
 				throw new IllegalAccessException("Module is focrfully disabled");
 			}
-			if (!MiscUtil.classAvailable(moduleClass)) {
+			if (!MiscUtil.classAvailable(moduleImplClassName)) {
 				throw new org.simplejavamail.internal.modules.ModuleLoaderException(format(org.simplejavamail.internal.modules.ModuleLoaderException.ERROR_MODULE_MISSING, moduleName, moduleHome));
 			}
-			return (T) Class.forName(moduleClass).newInstance();
+			return (T) Class.forName(moduleImplClassName).newInstance();
 		} catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
 			throw new org.simplejavamail.internal.modules.ModuleLoaderException(format(org.simplejavamail.internal.modules.ModuleLoaderException.ERROR_LOADING_MODULE, moduleName), e);
 		}

modules/smime-module/src/main/java/org/simplejavamail/internal/smimesupport/SMIMESupport.java

@@ -339,7 +339,6 @@ public String getSignedByAddress(@NotNull AttachmentResource smimeAttachment) {
 	 * @see SMIMEModule#getSignedByAddress(MimePart)
 	 */
 	@Nullable
-	@SuppressWarnings("deprecation")
 	public String getSignedByAddress(@NotNull MimePart mimePart) {
 		try {
 			return getSignedByAddress(determineSMIMESigned(mimePart));