Fixed SpotBugs issue and static initialization issue that came up since I fixed the username check in the DemoAppBase (which checks if the placeholders have been replaced for gmail authentication or else it throws an exception when the class is loaded)

Author: bbottema

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

@@ -1,7 +1,9 @@
 package org.simplejavamail.internal.batchsupport;
 
+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;
 import org.jetbrains.annotations.NotNull;
@@ -17,6 +19,7 @@
 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;
@@ -92,6 +95,7 @@ private void ensureClusterInitialized(@NotNull OperationalConfig operationalConf
 	 */
 	@NotNull
 	@Override
+	@SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH", justification = "This is bullshit, Spotbugs. There's a requireNonNull() right in front of you, you numbnuts")
 	public LifecycleDelegatingTransport acquireTransport(@NotNull final UUID clusterKey, @NotNull final Session session, boolean stickySession) {
 		try {
 			requireNonNull(smtpConnectionPool, "Connection pool used before it was initialized. This shouldn't be possible.");
@@ -108,9 +112,10 @@ public LifecycleDelegatingTransport acquireTransport(@NotNull final UUID cluster
 	// since the SMTP connection pool doesn't know about Simple Java Mail,
 	// it won't know where to look for the OAUTH2 token unless we copy the property
 	private void checkConfigureOAuth2Token(Session session) {
-		if (session.getProperties().containsKey(TransportStrategy.OAUTH2_TOKEN_PROPERTY)) {
-			session.getProperties().setProperty(SmtpConnectionPool.OAUTH2_TOKEN_PROPERTY,
-					session.getProperties().getProperty(TransportStrategy.OAUTH2_TOKEN_PROPERTY));
+		val props = session.getProperties();
+		if (props.containsKey(TransportStrategy.OAUTH2_TOKEN_PROPERTY)) {
+			props.setProperty(SmtpConnectionPool.OAUTH2_TOKEN_PROPERTY,
+					props.getProperty(TransportStrategy.OAUTH2_TOKEN_PROPERTY));
 		}
 	}
 

modules/core-test-module/src/main/java/demo/DemoAppBase.java

@@ -7,8 +7,6 @@
 import testutil.ConfigLoaderTestHelper;
 import testutil.ImplLoader;
 
-import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
-
 public class DemoAppBase {
 
 	static final Logger LOGGER = LoggerFactory.getLogger(DemoAppBase.class);
@@ -49,14 +47,4 @@ static MailerRegularBuilder<?> buildMailer(String host, int port, String gMailAd
 				.withTransportModeLoggingOnly(LOGGING_MODE)
 				.clearProxy();
 	}
-	
-	public static byte[] produceThumbsUpImage() {
-		String base64String = "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABeElEQVRYw2NgoAAYGxu3GxkZ7TY1NZVloDcA" +
-				"Wq4MxH+B+D8Qv3FwcOCgtwM6oJaDMTAUXOhmuYqKCjvQ0pdoDrCnmwNMTEwakC0H4u8GBgYC9Ap6DSD+iewAoIPm0ctyLqBlp9F" +
-				"8/x+YE4zpYT8T0LL16JYD8U26+B7oyz4sloPwenpYno3DchCeROsUbwa05A8eB3wB4kqgIxOAuArIng7EW4H4EhC/B+JXQLwDaI4" +
-				"ryZaDSjeg5mt4LCcFXyIn1fdSyXJQVt1OtMWGhoai0OD8T0W8GohZifE1PxD/o7LlsPLiFNAKRrwOABWptLAcqc6QGDAHQEOAYaA" +
-				"c8BNotsJAOgAUAosG1AFA/AtUoY3YEFhKMAvS2AE7iC1+WaG1H6gY3gzE36hUFJ8mqzbU1dUVBBqQBzTgIDQRkWo5qCZdpaenJ0Z" +
-				"x1aytrc0DDB0foIG1oAYKqC0IZK8D4n1AfA6IzwPxXpCFoGoZVEUDaRGGUTAKRgEeAAA2eGJC+ETCiAAAAABJRU5ErkJggg==";
-		return parseBase64Binary(base64String);
-	}
-}
+}

modules/core-test-module/src/main/java/testutil/ThumbsUpImage.java

@@ -0,0 +1,15 @@
+package testutil;
+
+import static jakarta.xml.bind.DatatypeConverter.parseBase64Binary;
+
+public class ThumbsUpImage {
+    public static byte[] produceThumbsUpImage() {
+        String base64String = "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABeElEQVRYw2NgoAAYGxu3GxkZ7TY1NZVloDcA" +
+                "Wq4MxH+B+D8Qv3FwcOCgtwM6oJaDMTAUXOhmuYqKCjvQ0pdoDrCnmwNMTEwakC0H4u8GBgYC9Ap6DSD+iewAoIPm0ctyLqBlp9F" +
+                "8/x+YE4zpYT8T0LL16JYD8U26+B7oyz4sloPwenpYno3DchCeROsUbwa05A8eB3wB4kqgIxOAuArIng7EW4H4EhC/B+JXQLwDaI4" +
+                "ryZaDSjeg5mt4LCcFXyIn1fdSyXJQVt1OtMWGhoai0OD8T0W8GohZifE1PxD/o7LlsPLiFNAKRrwOABWptLAcqc6QGDAHQEOAYaA" +
+                "c8BNotsJAOgAUAosG1AFA/AtUoY3YEFhKMAvS2AE7iC1+WaG1H6gY3gzE36hUFJ8mqzbU1dUVBBqQBzTgIDQRkWo5qCZdpaenJ0Z" +
+                "x1aytrc0DDB0foIG1oAYKqC0IZK8D4n1AfA6IzwPxXpCFoGoZVEUDaRGGUTAKRgEeAAA2eGJC+ETCiAAAAABJRU5ErkJggg==";
+        return parseBase64Binary(base64String);
+    }
+}

modules/simple-java-mail/src/test/java/demo/EmailTypesDemoApp.java

@@ -4,11 +4,13 @@
 import org.simplejavamail.api.mailer.Mailer;
 import org.simplejavamail.email.EmailBuilder;
 import testutil.ModuleLoaderTestHelper;
+import testutil.ThumbsUpImage;
 
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static testutil.ThumbsUpImage.*;
 
 /**
  * Demonstration program for the Simple Java Mail framework. Just fill your gmail, password and press GO.

modules/simple-java-mail/src/test/java/demo/FullEmailDemoApp.java

@@ -9,11 +9,13 @@
 import org.simplejavamail.email.EmailBuilder;
 import testutil.CalendarHelper;
 import testutil.ModuleLoaderTestHelper;
+import testutil.ThumbsUpImage;
 
 import java.io.IOException;
 
 import static demo.ResourceFolderHelper.determineResourceFolder;
 import static java.nio.charset.Charset.defaultCharset;
+import static testutil.ThumbsUpImage.*;
 
 /**
  * Demonstration program for the Simple Java Mail framework. Just fill your gmail, password and press GO.

modules/simple-java-mail/src/test/java/org/simplejavamail/api/email/EmailTest.java

@@ -1,6 +1,5 @@
 package org.simplejavamail.api.email;
 
-import demo.DemoAppBase;
 import jakarta.mail.util.ByteArrayDataSource;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
@@ -10,6 +9,7 @@
 import org.simplejavamail.internal.util.NamedDataSource;
 import testutil.ConfigLoaderTestHelper;
 import testutil.EmailHelper;
+import testutil.ThumbsUpImage;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -32,6 +32,7 @@
 import static org.simplejavamail.api.email.CalendarMethod.REPLY;
 import static org.simplejavamail.api.email.ContentTransferEncoding.BASE_64;
 import static org.simplejavamail.util.TestDataHelper.loadPkcs12KeyStore;
+import static testutil.ThumbsUpImage.*;
 
 public class EmailTest {
 
@@ -97,8 +98,8 @@ public void testToStringFull() {
 				.withHeader("dummyHeader2", "dummyHeaderValue2")
 				.withCalendarText(CalendarMethod.ADD, "Calendar text")
 				.signWithDomainKey("dkim_key", "dkim_domain", "dkim_selector")
-				.withEmbeddedImage("the_image", DemoAppBase.produceThumbsUpImage(), "image/png")
-				.withAttachment("the_attachment", DemoAppBase.produceThumbsUpImage(), "image/png")
+				.withEmbeddedImage("the_image", produceThumbsUpImage(), "image/png")
+				.withAttachment("the_attachment", produceThumbsUpImage(), "image/png")
 				.withAttachment("described_attachment", "blah".getBytes(defaultCharset()), "text/plain", "cool description", BASE_64)
 				.buildEmail();