clean up imports

modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/AuthenticatedSocksHelper.java

@@ -1,12 +1,11 @@
 package org.simplejavamail.internal.authenticatedsockssupport;
 
+import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.api.internal.authenticatedsockssupport.socks5server.AnonymousSocks5Server;
 import org.simplejavamail.api.mailer.config.ProxyConfig;
 import org.simplejavamail.internal.authenticatedsockssupport.socks5server.AnonymousSocks5ServerImpl;
 import org.simplejavamail.internal.modules.AuthenticatedSocksModule;
 
-import org.jetbrains.annotations.NotNull;
-
 import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument;
 
 @SuppressWarnings("unused")

modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/AuthenticatingSocks5Bridge.java

@@ -1,14 +1,14 @@
 package org.simplejavamail.internal.authenticatedsockssupport;
 
-import org.simplejavamail.api.mailer.config.ProxyConfig;
+import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.api.internal.authenticatedsockssupport.common.Socks5Bridge;
+import org.simplejavamail.api.mailer.config.ProxyConfig;
 import org.simplejavamail.internal.authenticatedsockssupport.socks5client.ProxyCredentials;
 import org.simplejavamail.internal.authenticatedsockssupport.socks5client.Socks5;
 import org.simplejavamail.internal.authenticatedsockssupport.socks5client.SocksSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.jetbrains.annotations.NotNull;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;

modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5client/SocksCommandSender.java

@@ -1,8 +1,8 @@
 package org.simplejavamail.internal.authenticatedsockssupport.socks5client;
 
 import org.jetbrains.annotations.NotNull;
-import org.simplejavamail.internal.util.MiscUtil;
 import org.simplejavamail.internal.authenticatedsockssupport.common.SocksException;
+import org.simplejavamail.internal.util.MiscUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/concurrent/NamedThreadFactory.java

@@ -1,6 +1,7 @@
 package org.simplejavamail.internal.batchsupport.concurrent;
 
 import org.jetbrains.annotations.NotNull;
+
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 

modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineConsumer.java

@@ -2,6 +2,8 @@
 
 import org.bbottema.javareflection.valueconverter.IncompatibleTypeException;
 import org.bbottema.javareflection.valueconverter.ValueConversionHelper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.simplejavamail.api.internal.clisupport.model.CliCommandType;
 import org.simplejavamail.api.internal.clisupport.model.CliDeclaredOptionSpec;
 import org.simplejavamail.api.internal.clisupport.model.CliReceivedCommand;
@@ -11,8 +13,6 @@
 import picocli.CommandLine.Model.OptionSpec;
 import picocli.CommandLine.ParseResult;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;

modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineConsumerUsageHelper.java

@@ -1,5 +1,7 @@
 package org.simplejavamail.internal.clisupport;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import picocli.CommandLine;
 import picocli.CommandLine.Help;
 import picocli.CommandLine.Help.Ansi;
@@ -8,9 +10,6 @@
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Model.OptionSpec;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import static java.lang.String.format;
 import static java.lang.System.err;
 import static java.lang.System.out;

modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/valueinterpreters/FileBasedFunction.java

@@ -3,10 +3,10 @@
 import org.bbottema.javareflection.ReflectionUtils;
 import org.bbottema.javareflection.valueconverter.IncompatibleTypeException;
 import org.bbottema.javareflection.valueconverter.ValueFunction;
+import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.MailException;
 import org.slf4j.Logger;
 
-import org.jetbrains.annotations.NotNull;
 import java.io.File;
 
 import static org.slf4j.LoggerFactory.getLogger;

modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/valueinterpreters/PemFilePathToX509CertificateFunction.java

@@ -1,9 +1,9 @@
 package org.simplejavamail.internal.clisupport.valueinterpreters;
 
 import org.bbottema.javareflection.valueconverter.IncompatibleTypeException;
+import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.internal.util.CertificationUtil;
 
-import org.jetbrains.annotations.NotNull;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.security.NoSuchProviderException;

modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/valueinterpreters/StringToFileFunction.java

@@ -1,6 +1,7 @@
 package org.simplejavamail.internal.clisupport.valueinterpreters;
 
 import org.jetbrains.annotations.NotNull;
+
 import java.io.File;
 
 public class StringToFileFunction extends FileBasedFunction<File> {

modules/cli-module/src/test/java/demo/CliDemoApp.java

@@ -1,7 +1,7 @@
 package demo;
 
-import org.simplejavamail.internal.clisupport.CliSupport;
 import org.simplejavamail.api.mailer.config.ServerConfig;
+import org.simplejavamail.internal.clisupport.CliSupport;
 import testutil.ModuleLoaderTestHelper;
 
 import static demo.ResourceFolderHelper.determineResourceFolder;

modules/cli-module/src/test/java/org/simplejavamail/api/internal/clisupport/model/CliBuilderApiTypeTest.java

@@ -3,9 +3,9 @@
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.simplejavamail.internal.clisupport.BuilderApiToPicocliCommandsMapper.colorizeOptionsInText;
 import static org.simplejavamail.api.internal.clisupport.model.CliBuilderApiType.EMAIL;
 import static org.simplejavamail.api.internal.clisupport.model.CliBuilderApiType.MAILER;
+import static org.simplejavamail.internal.clisupport.BuilderApiToPicocliCommandsMapper.colorizeOptionsInText;
 
 public class CliBuilderApiTypeTest {
 

modules/cli-module/src/test/java/org/simplejavamail/internal/clisupport/CliCommandLineConsumerTest.java

@@ -2,9 +2,9 @@
 
 import org.bbottema.javareflection.ClassUtils;
 import org.bbottema.javareflection.model.MethodModifier;
+import org.jetbrains.annotations.Nullable;
 import org.junit.Test;
 
-import org.jetbrains.annotations.Nullable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 

modules/cli-module/src/test/java/org/simplejavamail/internal/clisupport/CliDeclaredOptionSpecTest.java

@@ -1,9 +1,9 @@
 package org.simplejavamail.internal.clisupport;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.simplejavamail.api.internal.clisupport.model.CliDeclaredOptionSpec;
 
-import org.jetbrains.annotations.NotNull;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;

modules/core-module/src/main/java/org/simplejavamail/api/email/Email.java

@@ -17,7 +17,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TimeZone;
 
 import static java.lang.Boolean.TRUE;

modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java

@@ -20,7 +20,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.regex.Pattern;
 
 import static java.util.regex.Pattern.compile;

modules/core-module/src/main/java/org/simplejavamail/api/internal/clisupport/model/CliBuilderApiType.java

@@ -1,6 +1,7 @@
 package org.simplejavamail.api.internal.clisupport.model;
 
 import org.jetbrains.annotations.NotNull;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;

modules/core-module/src/main/java/org/simplejavamail/api/internal/outlooksupport/model/OutlookMessage.java

@@ -1,6 +1,7 @@
 package org.simplejavamail.api.internal.outlooksupport.model;
 
 import org.jetbrains.annotations.Nullable;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

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

@@ -1,12 +1,12 @@
 package org.simplejavamail.api.mailer.config;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.simplejavamail.api.mailer.CustomMailer;
 import org.simplejavamail.api.mailer.Mailer;
 import org.simplejavamail.api.mailer.MailerGenericBuilder;
 import org.simplejavamail.api.mailer.MailerRegularBuilder;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;

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

@@ -1,10 +1,9 @@
 package org.simplejavamail.internal.modules;
 
+import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.api.internal.authenticatedsockssupport.socks5server.AnonymousSocks5Server;
 import org.simplejavamail.api.mailer.config.ProxyConfig;
 
-import org.jetbrains.annotations.NotNull;
-
 public interface AuthenticatedSocksModule {
 
 	String NAME = "Authenticated socks module";

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

@@ -1,8 +1,8 @@
 package org.simplejavamail.internal.util;
 
+import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.MailException;
 
-import org.jetbrains.annotations.NotNull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

modules/dkim-module/src/main/java/org/simplejavamail/internal/dkimsupport/DKIMSigningException.java

@@ -1,9 +1,8 @@
 package org.simplejavamail.internal.dkimsupport;
 
-import org.simplejavamail.MailException;
-
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.simplejavamail.MailException;
 
 import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument;
 

modules/outlook-module/src/main/java/org/simplejavamail/internal/outlooksupport/converter/OutlookMessageException.java

@@ -1,9 +1,8 @@
 package org.simplejavamail.internal.outlooksupport.converter;
 
-import org.simplejavamail.MailException;
-
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.simplejavamail.MailException;
 
 import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument;
 

modules/outlook-module/src/main/java/org/simplejavamail/internal/outlooksupport/internal/model/OutlookMessageProxy.java

@@ -1,5 +1,7 @@
 package org.simplejavamail.internal.outlooksupport.internal.model;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.simplejavamail.api.internal.outlooksupport.model.OutlookAttachment;
 import org.simplejavamail.api.internal.outlooksupport.model.OutlookFileAttachment;
 import org.simplejavamail.api.internal.outlooksupport.model.OutlookMessage;
@@ -9,16 +11,16 @@
 import org.simplejavamail.outlookmessageparser.model.OutlookSmime.OutlookSmimeApplicationSmime;
 import org.simplejavamail.outlookmessageparser.model.OutlookSmime.OutlookSmimeMultipartSigned;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.simplejavamail.internal.outlooksupport.internal.model.OutlookSmimeProxy.*;
+import static org.simplejavamail.internal.outlooksupport.internal.model.OutlookSmimeProxy.OutlookSmimeApplicationOctetStreamProxy;
+import static org.simplejavamail.internal.outlooksupport.internal.model.OutlookSmimeProxy.OutlookSmimeApplicationSmimeProxy;
+import static org.simplejavamail.internal.outlooksupport.internal.model.OutlookSmimeProxy.OutlookSmimeMultipartSignedProxy;
 
 /**
  * @see OutlookMessage

modules/outlook-module/src/main/java/org/simplejavamail/internal/outlooksupport/internal/model/OutlookSmimeProxy.java

@@ -1,8 +1,7 @@
 package org.simplejavamail.internal.outlooksupport.internal.model;
 
-import org.simplejavamail.api.internal.outlooksupport.model.OutlookSmime;
-
 import org.jetbrains.annotations.Nullable;
+import org.simplejavamail.api.internal.outlooksupport.model.OutlookSmime;
 
 public abstract class OutlookSmimeProxy<T extends org.simplejavamail.outlookmessageparser.model.OutlookSmime> implements OutlookSmime {
 

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/EmailConverter.java

@@ -46,7 +46,9 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.simplejavamail.api.email.OriginalSmimeDetails.SmimeMode.PLAIN;
 import static org.simplejavamail.internal.moduleloader.ModuleLoader.loadSmimeModule;
-import static org.simplejavamail.internal.util.MiscUtil.*;
+import static org.simplejavamail.internal.util.MiscUtil.extractCID;
+import static org.simplejavamail.internal.util.MiscUtil.readInputStreamToString;
+import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty;
 import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument;
 import static org.simplejavamail.internal.util.Preconditions.verifyNonnullOrEmpty;
 

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

@@ -33,7 +33,9 @@
 
 import static java.lang.Boolean.TRUE;
 import static java.lang.String.format;
-import static org.simplejavamail.internal.util.MiscUtil.*;
+import static org.simplejavamail.internal.util.MiscUtil.orOther;
+import static org.simplejavamail.internal.util.MiscUtil.orOtherList;
+import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty;
 import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument;
 
 /**

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

@@ -13,7 +13,9 @@
 import java.util.Date;
 
 import static java.util.Optional.ofNullable;
-import static org.simplejavamail.internal.util.MiscUtil.*;
+import static org.simplejavamail.internal.util.MiscUtil.checkArgumentNotEmpty;
+import static org.simplejavamail.internal.util.MiscUtil.orOther;
+import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty;
 
 /**
  * Helper class that produces and populates a mime messages. Deals with jakarta.mail RFC MimeMessage stuff, as well as

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

@@ -11,7 +11,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * This interface is only there to improve readability there where internal builder API is used.

modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/MailerHelper.java

@@ -16,7 +16,6 @@
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.Set;
 
 import static java.lang.Boolean.TRUE;
 import static java.lang.String.format;

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

@@ -29,9 +29,24 @@
 import java.util.concurrent.Executors;
 
 import static java.lang.String.format;
-import static org.simplejavamail.config.ConfigLoader.*;
-import static org.simplejavamail.config.ConfigLoader.Property.*;
-import static org.simplejavamail.internal.util.MiscUtil.*;
+import static org.simplejavamail.config.ConfigLoader.Property;
+import static org.simplejavamail.config.ConfigLoader.Property.DEFAULT_CONNECTIONPOOL_CLUSTER_KEY;
+import static org.simplejavamail.config.ConfigLoader.Property.PROXY_HOST;
+import static org.simplejavamail.config.ConfigLoader.Property.PROXY_PASSWORD;
+import static org.simplejavamail.config.ConfigLoader.Property.PROXY_USERNAME;
+import static org.simplejavamail.config.ConfigLoader.Property.SMIME_SIGNING_KEYSTORE;
+import static org.simplejavamail.config.ConfigLoader.Property.SMIME_SIGNING_KEYSTORE_PASSWORD;
+import static org.simplejavamail.config.ConfigLoader.Property.SMIME_SIGNING_KEY_ALIAS;
+import static org.simplejavamail.config.ConfigLoader.Property.SMIME_SIGNING_KEY_PASSWORD;
+import static org.simplejavamail.config.ConfigLoader.getStringProperty;
+import static org.simplejavamail.config.ConfigLoader.hasProperty;
+import static org.simplejavamail.config.ConfigLoader.valueOrProperty;
+import static org.simplejavamail.config.ConfigLoader.valueOrPropertyAsBoolean;
+import static org.simplejavamail.config.ConfigLoader.valueOrPropertyAsInteger;
+import static org.simplejavamail.config.ConfigLoader.valueOrPropertyAsString;
+import static org.simplejavamail.internal.util.MiscUtil.checkArgumentNotEmpty;
+import static org.simplejavamail.internal.util.MiscUtil.readInputStreamToBytes;
+import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty;
 import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument;
 import static org.simplejavamail.internal.util.Preconditions.verifyNonnullOrEmpty;
 import static org.simplejavamail.mailer.internal.MailerException.ERROR_READING_FROM_FILE;

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

@@ -2,9 +2,8 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.simplejavamail.api.mailer.config.ProxyConfig;
-
 import org.jetbrains.annotations.Nullable;
+import org.simplejavamail.api.mailer.config.ProxyConfig;
 
 import static java.lang.String.format;
 

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

@@ -1,9 +1,8 @@
 package org.simplejavamail.mailer.internal;
 
-import org.simplejavamail.api.mailer.config.ServerConfig;
-
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.simplejavamail.api.mailer.config.ServerConfig;
 
 import javax.net.ssl.SSLSocketFactory;