Added some tests

Author: bbottema

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

@@ -11,7 +11,7 @@
  * Governance for all emails being sent through the current {@link org.simplejavamail.api.mailer.Mailer} instance.
  * <p>
  * In simpeler terms: this class represents actions taken or configuration used by default for each individual email sent through the current mailer. For example, you might want to S/MIME sign all
- * emails by default. You can do it manually on each email of course, but then the keystore used for this not reused.
+ * emails by default. You can do it manually on each email of course, but then the keystore used for this is not reused.
  */
 public interface EmailGovernance {
 

modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java

@@ -9,7 +9,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;

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

@@ -1,44 +1,26 @@
 package org.simplejavamail.mailer.internal;
 
 import com.sanctionco.jmail.EmailValidator;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
 import org.jetbrains.annotations.Nullable;
 import org.simplejavamail.api.mailer.config.EmailGovernance;
 import org.simplejavamail.api.mailer.config.Pkcs12Config;
 
 /**
  * @see EmailGovernance
  */
+@ToString
+@AllArgsConstructor
+@Getter()
 class EmailGovernanceImpl implements EmailGovernance {
-	@Nullable private final EmailValidator emailValidator;
-	@Nullable private final Pkcs12Config pkcs12ConfigForSmimeSigning;
-
-	EmailGovernanceImpl(@Nullable final EmailValidator emailValidator, @Nullable final Pkcs12Config pkcs12ConfigForSmimeSigning) {
-		this.emailValidator = emailValidator;
-		this.pkcs12ConfigForSmimeSigning = pkcs12ConfigForSmimeSigning;
-	}
-
-	@Override
-	public String toString() {
-		final StringBuilder sb = new StringBuilder("EmailGovernanceImpl{");
-		sb.append("emailValidator=").append(emailValidator);
-		sb.append(", pkcs12ConfigForSmimeSigning=").append(pkcs12ConfigForSmimeSigning);
-		sb.append('}');
-		return sb.toString();
-	}
-
 	/**
 	 * @see EmailGovernance#getEmailValidator()
 	 */
-	@Override
-	public @Nullable EmailValidator getEmailValidator() {
-		return emailValidator;
-	}
-
+	@Nullable private final EmailValidator emailValidator;
 	/**
 	 * @see EmailGovernance#getPkcs12ConfigForSmimeSigning()
 	 */
-	@Override
-	public @Nullable Pkcs12Config getPkcs12ConfigForSmimeSigning() {
-		return pkcs12ConfigForSmimeSigning;
-	}
+	@Nullable private final Pkcs12Config pkcs12ConfigForSmimeSigning;
 }

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

@@ -8,7 +8,11 @@
 import org.simplejavamail.api.email.Email;
 import org.simplejavamail.api.internal.authenticatedsockssupport.socks5server.AnonymousSocks5Server;
 import org.simplejavamail.api.mailer.Mailer;
-import org.simplejavamail.api.mailer.config.*;
+import org.simplejavamail.api.mailer.config.EmailGovernance;
+import org.simplejavamail.api.mailer.config.OperationalConfig;
+import org.simplejavamail.api.mailer.config.ProxyConfig;
+import org.simplejavamail.api.mailer.config.ServerConfig;
+import org.simplejavamail.api.mailer.config.TransportStrategy;
 import org.simplejavamail.config.ConfigLoader;
 import org.simplejavamail.internal.moduleloader.ModuleLoader;
 import org.simplejavamail.internal.util.concurrent.AsyncOperationHelper;

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

@@ -11,7 +11,12 @@
 import javax.net.ssl.SSLSocketFactory;
 
 import static java.util.Optional.ofNullable;
-import static org.simplejavamail.config.ConfigLoader.Property.*;
+import static org.simplejavamail.config.ConfigLoader.Property.CUSTOM_SSLFACTORY_CLASS;
+import static org.simplejavamail.config.ConfigLoader.Property.SMTP_HOST;
+import static org.simplejavamail.config.ConfigLoader.Property.SMTP_PASSWORD;
+import static org.simplejavamail.config.ConfigLoader.Property.SMTP_PORT;
+import static org.simplejavamail.config.ConfigLoader.Property.SMTP_USERNAME;
+import static org.simplejavamail.config.ConfigLoader.Property.TRANSPORT_STRATEGY;
 import static org.simplejavamail.config.ConfigLoader.hasProperty;
 import static org.simplejavamail.internal.util.MiscUtil.checkArgumentNotEmpty;
 import static org.simplejavamail.internal.util.MiscUtil.emptyAsNull;

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

@@ -1,5 +1,7 @@
 package org.simplejavamail.mailer.internal;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import org.simplejavamail.api.mailer.config.ProxyConfig;
 
 import org.jetbrains.annotations.Nullable;
@@ -9,6 +11,8 @@
 /**
  * @see ProxyConfig
  */
+@AllArgsConstructor
+@Getter
 class ProxyConfigImpl implements ProxyConfig {
 
 	@Nullable private final String remoteProxyHost;
@@ -17,14 +21,6 @@ class ProxyConfigImpl implements ProxyConfig {
 	@Nullable private final String password;
 	@Nullable private final Integer proxyBridgePort;
 
-	ProxyConfigImpl(@Nullable final String remoteProxyHost, @Nullable final Integer remoteProxyPort, @Nullable final String username, @Nullable final String password, @Nullable final Integer proxyBridgePort) {
-		this.remoteProxyHost = remoteProxyHost;
-		this.remoteProxyPort = remoteProxyPort;
-		this.username = username;
-		this.password = password;
-		this.proxyBridgePort = proxyBridgePort;
-	}
-	
 	@Override
 	public boolean requiresProxy() {
 		return remoteProxyHost != null;
@@ -47,34 +43,4 @@ public String toString() {
 		}
 		return str;
 	}
-	
-	@Override
-	@Nullable
-	public Integer getProxyBridgePort() {
-		return proxyBridgePort;
-	}
-	
-	@Override
-	@Nullable
-	public String getRemoteProxyHost() {
-		return remoteProxyHost;
-	}
-	
-	@Override
-	@Nullable
-	public Integer getRemoteProxyPort() {
-		return remoteProxyPort;
-	}
-	
-	@Override
-	@Nullable
-	public String getUsername() {
-		return username;
-	}
-	
-	@Override
-	@Nullable
-	public String getPassword() {
-		return password;
-	}
 }

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

@@ -1,8 +1,9 @@
 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;
 
@@ -20,8 +21,8 @@ class ServerConfigImpl implements ServerConfig {
 	@Nullable private final String customSSLFactoryClass;
 	@Nullable private final SSLSocketFactory customSSLFactoryInstance;
 
-	ServerConfigImpl(@NotNull final String host, @NotNull final Integer port, @Nullable final String username, @Nullable final String password,
-					 @Nullable final String customSSLFactoryClass, final @Nullable SSLSocketFactory customSSLFactoryInstance) {
+	ServerConfigImpl(@NotNull final String host, @NotNull final Integer port, @Nullable final String username, @Nullable final String password, @Nullable final String customSSLFactoryClass,
+			final @Nullable SSLSocketFactory customSSLFactoryInstance) {
 		this.host = host;
 		this.port = port;
 		this.username = username;

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/internal/MailerImplTest.java

@@ -1,9 +1,11 @@
 package org.simplejavamail.mailer.internal;
 
 import jakarta.mail.Session;
+import lombok.val;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
+import org.simplejavamail.MailException;
 import org.simplejavamail.api.mailer.Mailer;
 import org.simplejavamail.api.mailer.config.EmailGovernance;
 import org.simplejavamail.api.mailer.config.ProxyConfig;
@@ -14,11 +16,10 @@
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.simplejavamail.api.mailer.config.TransportStrategy.SMTP;
-import static org.simplejavamail.api.mailer.config.TransportStrategy.SMTPS;
-import static org.simplejavamail.api.mailer.config.TransportStrategy.SMTP_TLS;
+import static org.simplejavamail.api.mailer.config.TransportStrategy.*;
 import static org.simplejavamail.util.TestDataHelper.loadPkcs12KeyStore;
 import static testutil.EmailHelper.createDummyOperationalConfig;
 
@@ -70,6 +71,21 @@ public void trustAllHosts_SMTP_TLS() {
 		assertThat(session.getProperties().getProperty("mail.smtp.ssl.checkserveridentity")).isEqualTo("true");
 		assertThat(session.getProperties().getProperty("mail.smtps.ssl.checkserveridentity")).isNull();
 	}
+
+	@Test
+	public void setPropertOAuth2Property() {
+		val serverConfig = new ServerConfigImpl("hosty", 10, "usey", "passey", null, null);
+		val mailer = new MailerImpl(serverConfig, SMTP_OAUTH2, createDummyEmailGovernance(), createEmptyProxyConfig(), null, createDummyOperationalConfig(EMPTY_LIST, true, false));
+		assertThat(mailer.getSession().getProperties().getProperty("mail.smtp.auth.mechanisms")).isEqualTo("XOAUTH2");
+	}
+
+	@Test
+	public void checkForMissingOAuth2Token() {
+		val serverConfig = new ServerConfigImpl("hosty", 10, "usey", null, null, null);
+		assertThatThrownBy(() -> new MailerImpl(serverConfig, SMTP_OAUTH2, createDummyEmailGovernance(), createEmptyProxyConfig(), null, createDummyOperationalConfig(EMPTY_LIST, true, false)))
+				.hasMessage("TransportStrategy is OAUTH2 but no OAUTH2 token provided as password")
+				.isInstanceOf(MailException.class);
+	}
 
 	@Test
 	public void trustHosts() {