Merge branch 'develop'

Author: bbottema

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/pom.xml

@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>smtp-connection-pool</artifactId>
-            <version>2.1.1</version>
+            <version>2.2.0</version>
         </dependency>
     </dependencies>
 </project>

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

@@ -2,7 +2,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import jakarta.mail.Session;
-import jakarta.mail.Transport;
 import lombok.val;
 import org.bbottema.clusteredobjectpool.core.api.ResourceKey.ResourceClusterAndPoolKey;
 import org.bbottema.genericobjectpool.PoolableObject;
@@ -14,12 +13,12 @@
 import org.simplejavamail.internal.batchsupport.concurrent.NonJvmBlockingThreadPoolExecutor;
 import org.simplejavamail.internal.modules.BatchModule;
 import org.simplejavamail.internal.util.concurrent.AsyncOperationHelper;
+import org.simplejavamail.smtpconnectionpool.SessionTransport;
 import org.simplejavamail.smtpconnectionpool.SmtpConnectionPool;
 import org.simplejavamail.smtpconnectionpool.SmtpConnectionPoolClustered;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Properties;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
@@ -100,7 +99,7 @@ public LifecycleDelegatingTransport acquireTransport(@NotNull final UUID cluster
 		try {
 			requireNonNull(smtpConnectionPool, "Connection pool used before it was initialized. This shouldn't be possible.");
 			checkConfigureOAuth2Token(session);
-			final PoolableObject<Transport> pooledTransport = stickySession
+			final PoolableObject<SessionTransport> pooledTransport = stickySession
 					? smtpConnectionPool.claimResourceFromPool(new ResourceClusterAndPoolKey<>(clusterKey, session))
 					: smtpConnectionPool.claimResourceFromCluster(clusterKey);
 			return new LifecycleDelegatingTransportImpl(pooledTransport);

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

@@ -1,7 +1,6 @@
 package org.simplejavamail.internal.batchsupport;
 
 import jakarta.mail.Session;
-import jakarta.mail.Transport;
 import org.bbottema.clusteredobjectpool.core.ClusterConfig;
 import org.bbottema.clusteredobjectpool.core.api.LoadBalancingStrategy;
 import org.bbottema.clusteredobjectpool.cyclingstrategies.RandomAccessLoadBalancing;
@@ -10,6 +9,7 @@
 import org.bbottema.genericobjectpool.util.Timeout;
 import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.api.mailer.config.OperationalConfig;
+import org.simplejavamail.smtpconnectionpool.SessionTransport;
 import org.simplejavamail.smtpconnectionpool.SmtpClusterConfig;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -34,11 +34,11 @@ static SmtpClusterConfig configureSmtpClusterConfig(@NotNull final OperationalCo
 		return smtpClusterConfig;
 	}
 
-	static boolean compareClusterConfig(@NotNull final OperationalConfig operationalConfig, final ClusterConfig<Session, Transport> config) {
+	static boolean compareClusterConfig(@NotNull final OperationalConfig operationalConfig, final ClusterConfig<Session, SessionTransport> config) {
 		return config.getDefaultCorePoolSize() != operationalConfig.getConnectionPoolCoreSize() ||
 				config.getDefaultMaxPoolSize() != operationalConfig.getConnectionPoolMaxSize() ||
 				config.getLoadBalancingStrategy().getClass() != determineLoadBalancingStrategy(operationalConfig).getClass() ||
-				!config.getDefaultExpirationPolicy().equals(new TimeoutSinceLastAllocationExpirationPolicy<Transport>(operationalConfig.getConnectionPoolExpireAfterMillis(), MILLISECONDS));
+				!config.getDefaultExpirationPolicy().equals(new TimeoutSinceLastAllocationExpirationPolicy<SessionTransport>(operationalConfig.getConnectionPoolExpireAfterMillis(), MILLISECONDS));
 	}
 
 	@SuppressWarnings("rawtypes")

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

@@ -1,25 +1,33 @@
 package org.simplejavamail.internal.batchsupport;
 
+import jakarta.mail.Session;
 import jakarta.mail.Transport;
 import org.bbottema.genericobjectpool.PoolableObject;
 import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.api.internal.batchsupport.LifecycleDelegatingTransport;
+import org.simplejavamail.smtpconnectionpool.SessionTransport;
 
 /**
  * Wraps {@link PoolableObject} to implement {@link LifecycleDelegatingTransport}, so transport resources
  * can be used outside the batchmodule and released to be reused in connection pool.
  */
 class LifecycleDelegatingTransportImpl implements LifecycleDelegatingTransport {
-	private final PoolableObject<Transport> pooledTransport;
+	private final PoolableObject<SessionTransport> pooledTransport;
 
-	LifecycleDelegatingTransportImpl(final PoolableObject<Transport> pooledTransport) {
+	LifecycleDelegatingTransportImpl(final PoolableObject<SessionTransport> pooledTransport) {
 		this.pooledTransport = pooledTransport;
 	}
 
+	@NotNull
+	@Override
+	public Session getSessionUsedToObtainTransport() {
+		return pooledTransport.getAllocatedObject().getSession();
+	}
+
 	@NotNull
 	@Override
 	public Transport getTransport() {
-		return pooledTransport.getAllocatedObject();
+		return pooledTransport.getAllocatedObject().getTransport();
 	}
 
 	@Override

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/cli/SimpleJavaMail.java

@@ -1,6 +1,6 @@
 package org.simplejavamail.cli;
 
-import static org.simplejavamail.internal.clisupport.CliSupport.*;
+import static org.simplejavamail.internal.clisupport.CliSupport.runCLI;
 
 /**
  * Entry class when using the command line interface. Wires all the args into the CLI support.

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;