#114: - Added reset methods to clear fields in builder

      - Resolved all static analyses issues (reported by IntelliJ)
      - Made Email immutable and all the fields final (excpet ID, which is updated during sending email)

Author: bbottema

src/main/java/org/simplejavamail/email/Email.java

@@ -161,6 +161,7 @@ public static final class EmailBuilderInstance {
 		 *
 		 * @see #replyingTo(MimeMessage, boolean, String)
 		 */
+		@SuppressWarnings("JavaDoc")
 		static final String DEFAULT_QUOTING_MARKUP = "<blockquote style=\"color: gray; border-left: 1px solid #4f4f4f; padding-left: " +
 				"1cm\">%s</blockquote>";
 

src/main/java/org/simplejavamail/email/EmailBuilder.java

@@ -168,15 +168,6 @@ public String propertyNameSSLTrust() {
 			return "mail.smtp.ssl.trust";
 		}
 
-		/**
-		 * @return {@link #opportunisticTLS}
-		 */
-		@Override
-		@Nullable
-		public Boolean getOpportunisticTLS() {
-			return opportunisticTLS;
-		}
-		
 		/**
 		 * Sets {@link #opportunisticTLS}. Setting <code>null</code> will revert to property value if available or default to {@value
 		 * DEFAULT_OPPORTUNISTIC_TLS}
@@ -465,11 +456,10 @@ public Properties generateProperties() {
 	public abstract String propertyNameTimeout();
 
 	/**
-	 * @see TransportStrategy#SMTP#getOpportunisticTLS()
-	 */
-	@Nullable public Boolean getOpportunisticTLS() { return false; }
-	/**
-	 * @see TransportStrategy#SMTP#setOpportunisticTLS(Boolean)
+	 * Refer to {@link #SMTP}.opportunisticTLS for details. Defaults to {@code false} for all other transport strategies.
+	 * <hr>
+	 * Determines whether TLS should be attempted for SMTP plain protocol (optional if offered by the SMTP server). Setting this flag to false causes
+	 * the {@link TransportStrategy#SMTP} to revert back to the legacy behavior.
 	 */
 	public void setOpportunisticTLS(@Nullable final Boolean opportunisticTLS) {}
 

src/main/java/org/simplejavamail/email/EmailPopulatingBuilder.java

@@ -278,7 +278,8 @@ private void sendMailClosure(@Nonnull final Session session, @Nonnull final Emai
 
 			logSession(session);
 			message.saveChanges(); // some headers and id's will be set for this specific message
-			email.setId(message.getMessageID());
+			//noinspection deprecation
+			email.internalSetId(message.getMessageID());
 
 			try {
 				synchronized (this) {

src/main/java/org/simplejavamail/mailer/config/TransportStrategy.java

@@ -7,22 +7,22 @@
 @SuppressWarnings("SameParameterValue")
 public class KeyStoreInfo {
 
-	private String keyStorePath;
-	private String password;
+	private final String keyStorePath;
+	private final String password;
 	private String type = "JKS";
 
-	public KeyStoreInfo() {
-	}
+//	public KeyStoreInfo() {
+//	}
 
 	public KeyStoreInfo(final String keyStorePath, final String password, final String type) {
 		this.keyStorePath = MiscUtil.checkNotNull(keyStorePath, "Argument [keyStorePath] may not be null");
 		this.password = MiscUtil.checkNotNull(password, "Argument [password] may not be null");
 		this.type = MiscUtil.checkNotNull(type, "Argument [type] may not be null");
 	}
 
-	public KeyStoreInfo(final String keyStorePath, final String password) {
-		this(keyStorePath, password, "JKS");
-	}
+//	public KeyStoreInfo(final String keyStorePath, final String password) {
+//		this(keyStorePath, password, "JKS");
+//	}
 
 	public String getKeyStorePath() {
 		return keyStorePath;

src/main/java/org/simplejavamail/mailer/internal/mailsender/MailSender.java

@@ -27,15 +27,15 @@ public class Socks5 {
 
 	private boolean alwaysResolveAddressLocally = false;
 
-	public Socks5(final InetSocketAddress socketAddress, final String username, final String password) {
-		this(socketAddress);
-		setCredentials(new ProxyCredentials(username, password));
-	}
-
-	public Socks5(final String host, final int port)
-			throws UnknownHostException {
-		this(InetAddress.getByName(host), port);
-	}
+//	public Socks5(final InetSocketAddress socketAddress, final String username, final String password) {
+//		this(socketAddress);
+//		setCredentials(new ProxyCredentials(username, password));
+//	}
+//
+//	public Socks5(final String host, final int port)
+//			throws UnknownHostException {
+//		this(InetAddress.getByName(host), port);
+//	}
 
 	Socks5(final InetAddress inetAddress, final int port) {
 		this(new InetSocketAddress(inetAddress, port));
@@ -52,12 +52,12 @@ private Socks5(final Socks5 chainProxy, final InetSocketAddress socketAddress) {
 		this.setChainProxy(chainProxy);
 	}
 
-	public Socks5(final String host, final int port, final ProxyCredentials credentials)
-			throws UnknownHostException {
-		this.inetAddress = InetAddress.getByName(host);
-		this.port = port;
-		this.credentials = credentials;
-	}
+//	public Socks5(final String host, final int port, final ProxyCredentials credentials)
+//			throws UnknownHostException {
+//		this.inetAddress = InetAddress.getByName(host);
+//		this.port = port;
+//		this.credentials = credentials;
+//	}
 
 	public void buildConnection()
 			throws IOException {

src/main/java/org/simplejavamail/mailer/internal/socks/socks5client/KeyStoreInfo.java

@@ -122,7 +122,7 @@ private Email assertSendingEmail(final EmailPopulatingBuilder originalEmailPopul
 		}
 		// bounce recipient is not part of the Mimemessage, but the Envelope and is configured on the Session, so just ignore this
 		if (originalEmailPopulatingBuilder.getBounceToRecipient() != null) {
-			receivedEmail.setBounceToRecipient(originalEmailPopulatingBuilder.getBounceToRecipient());
+			originalEmailPopulatingBuilder.clearBounceTo();
 		}
 		assertThat(receivedEmail).isEqualTo(originalEmailPopulatingBuilder.buildEmail());
 		return receivedEmail;

src/main/java/org/simplejavamail/mailer/internal/socks/socks5client/Socks5.java

@@ -278,12 +278,12 @@ public void testParser()
 		final EmailPopulatingBuilder emailPopulatingBuilderNormal = EmailHelper.createDummyEmailBuilder(true, false, false);
 
 		// let's try producing and then consuming a MimeMessage ->
+		// (bounce recipient is not part of the Mimemessage, but the Envelope and is configured on the Session, so just ignore this)
+		emailPopulatingBuilderNormal.clearBounceTo();
 		Email emailNormal = emailPopulatingBuilderNormal.buildEmail();
 		final MimeMessage mimeMessage = EmailConverter.emailToMimeMessage(emailNormal);
 		final Email emailFromMimeMessage = EmailConverter.mimeMessageToEmail(mimeMessage);
 
-		// bounce recipient is not part of the Mimemessage, but the Envelope and is configured on the Session, so just ignore this
-		emailFromMimeMessage.setBounceToRecipient(emailPopulatingBuilderNormal.getBounceToRecipient());
 
 		assertThat(emailFromMimeMessage).isEqualTo(emailNormal);
 	}