Finished migration to Java 1.8 (and initial minor cleanup)

Author: bbottema

pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.github.bbottema</groupId>
 		<artifactId>standard-project-parent</artifactId>
-		<version>1.0.18</version>
+		<version>1.0.24</version>
 	</parent>
 
 	<groupId>org.simplejavamail</groupId>
@@ -19,8 +19,6 @@
 	<inceptionYear>2021</inceptionYear>
 
 	<properties>
-		<java.version>1.8</java.version>
-		<se.eris.notnull.instrument>false</se.eris.notnull.instrument>
 		<automaticModuleName>com.github.bbottema.java-utils-mail-smime</automaticModuleName>
 		<!-- license plugin, see possible types here: -->
 		<!-- https://github.com/mathieucarbou/license-maven-plugin/tree/master/license-maven-plugin/src/main/resources/com/mycila/maven/plugin/license/templates -->

src/main/java/net/markenwerk/utils/mail/smime/MimeUtil.java

@@ -1,9 +1,7 @@
 package net.markenwerk.utils.mail.smime;
 
 import jakarta.mail.MessagingException;
-import jakarta.mail.Session;
 import jakarta.mail.internet.MimeBodyPart;
-import jakarta.mail.internet.MimeMessage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -20,18 +18,7 @@ final class MimeUtil {
 
 	private MimeUtil() {
 	}
-
-	/**
-	 * Translates a {@link MimeMessage} into its MIME-canonical form.
-	 */
-	static MimeMessage canonicalize(Session session, MimeMessage mimeMessage) throws MessagingException, IOException {
-		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-		OutputStream out = new MimeCanonicalOutputStream(buffer);
-		mimeMessage.writeTo(out);
-		out.close();
-		return new MimeMessage(session, new ByteArrayInputStream(buffer.toByteArray()));
-	}
-
+	
 	/**
 	 * Translates a {@link MimeBodyPart} into its MIME-canonical form.
 	 */
@@ -50,7 +37,7 @@ static MimeBodyPart canonicalize(MimeBodyPart mimeBodyPart) throws MessagingExce
 	private static class MimeCanonicalOutputStream extends java.io.FilterOutputStream {
 
 		int lastReadByte = -1;
-		byte[] crlf = new byte[] { (byte) '\r', (byte) '\n' };
+		final byte[] crlf = new byte[] { (byte) '\r', (byte) '\n' };
 
 		public MimeCanonicalOutputStream(java.io.OutputStream os) {
 			super(os);
@@ -68,11 +55,11 @@ public void write(int b) throws java.io.IOException {
 			lastReadByte = b;
 		}
 
-		public void write(byte b[]) throws java.io.IOException {
+		public void write(byte[] b) throws java.io.IOException {
 			write(b, 0, b.length);
 		}
 
-		public void write(byte b[], int off, int len) throws java.io.IOException {
+		public void write(byte[] b, int off, int len) throws java.io.IOException {
 			int start = off;
 
 			len = off + len;

src/main/java/net/markenwerk/utils/mail/smime/SmimeException.java

@@ -34,16 +34,5 @@ public SmimeException(String message, Throwable cause) {
 	public SmimeException(String message) {
 		super(message);
 	}
-
-	/**
-	 * Create a new {@code SmimeException} with the given cause.
-	 * 
-	 * @param cause
-	 *            The causing {@link Exception} wrapped by this
-	 *            {@code SmimeException}.
-	 */
-	public SmimeException(Throwable cause) {
-		super(cause);
-	}
-
+	
 }

src/main/java/net/markenwerk/utils/mail/smime/SmimeKey.java

@@ -85,7 +85,7 @@ public List<String> getAssociatedAddresses() {
 	}
 
 	private void extractAssociatedAddresses() {
-		List<String> addresses = new ArrayList<String>();
+		List<String> addresses = new ArrayList<>();
 		try {
 			X509Certificate certificate = getCertificate();
 			if (null != certificate) {

src/main/java/net/markenwerk/utils/mail/smime/SmimeKeyStore.java

@@ -21,10 +21,10 @@
  */
 public class SmimeKeyStore {
 
-	private KeyStore keyStore = null;
+	private final KeyStore keyStore;
 
 	/**
-	 * Creates a new {@code SmimeKeyStore} by loading a PKCS12 keystore from a
+	 * Creates a new {@code SmimeKeyStore} by loading a PKCS12 keystore from
 	 * the given input stream.
 	 * 
 	 * <p>
@@ -41,7 +41,7 @@ public SmimeKeyStore(InputStream stream, char[] password) {
 	}
 
 	/**
-	 * Creates a new {@code SmimeKeyStore} by loading a PKCS12 keystore from a
+	 * Creates a new {@code SmimeKeyStore} by loading a PKCS12 keystore from
 	 * the given input stream.
 	 * 
 	 * <p>
@@ -166,7 +166,7 @@ private X509Certificate[] copy(Certificate[] certificateChain) {
 	public Set<String> getPrivateKeyAliases() {
 		try {
 			Enumeration<String> aliases = keyStore.aliases();
-			Set<String> aliasSet = new HashSet<String>();
+			Set<String> aliasSet = new HashSet<>();
 			while (aliases.hasMoreElements()) {
 				String alias = aliases.nextElement();
 				if (keyStore.isKeyEntry(alias))

src/main/java/net/markenwerk/utils/mail/smime/SmimeState.java

@@ -35,6 +35,6 @@ public enum SmimeState {
 	 * Indicates that the {@link MimePart} or {@link MimeMultipart} is neither
 	 * S/MIME encrypted nor S/MIME signed.
 	 */
-	NEITHER;
-
+	NEITHER
+	
 }

src/main/java/net/markenwerk/utils/mail/smime/SmimeUtil.java

@@ -53,7 +53,6 @@
 import jakarta.mail.internet.MimePart;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.security.GeneralSecurityException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.Security;
@@ -84,6 +83,7 @@ public final class SmimeUtil {
 		}
 	}
 
+	@SuppressWarnings("unused")
 	private SmimeUtil() {
 	}
 
@@ -143,23 +143,20 @@ public static MimeBodyPart encrypt(MimeBodyPart mimeBodyPart, X509Certificate ce
 		try {
 			SMIMEEnvelopedGenerator generator = prepareGenerator(certificate);
 			OutputEncryptor encryptor = prepareEncryptor();
-
-			MimeBodyPart encryptedMimeBodyPart = generator.generate(mimeBodyPart, encryptor);
-			return encryptedMimeBodyPart;
+			
+			return generator.generate(mimeBodyPart, encryptor);
 
 		} catch (Exception e) {
 			throw handledException(e);
 		}
 	}
 
 	private static void copyHeaders(MimeBodyPart fromBodyPart, MimeMessage toMessage) throws MessagingException {
-		@SuppressWarnings("unchecked")
 		Enumeration<Header> headers = fromBodyPart.getAllHeaders();
 		copyHeaders(headers, toMessage);
 	}
 
 	private static void copyHeaders(MimeMessage fromMessage, MimeMessage toMessage) throws MessagingException {
-		@SuppressWarnings("unchecked")
 		Enumeration<Header> headers = fromMessage.getAllHeaders();
 		copyHeaders(headers, toMessage);
 	}
@@ -186,7 +183,7 @@ private static OutputEncryptor prepareEncryptor() throws CMSException {
 	}
 
 	/**
-	 * Decrypts a S/MIME encrypted MIME message and yields a new MIME message.
+	 * Decrypts an S/MIME encrypted MIME message and yields a new MIME message.
 	 * 
 	 * @param session
 	 *            The {@link Session} that is used in conjunction with the
@@ -215,7 +212,7 @@ public static MimeMessage decrypt(Session session, MimeMessage mimeMessage, Smim
 	}
 
 	/**
-	 * Decrypts a S/MIME encrypted MIME body part and yields a new MIME body
+	 * Decrypts an S/MIME encrypted MIME body part and yields a new MIME body
 	 * part.
 	 * 
 	 * @param mimeBodyPart
@@ -235,7 +232,7 @@ public static MimeBodyPart decrypt(MimeBodyPart mimeBodyPart, SmimeKey smimeKey)
 	}
 
 	/**
-	 * Decrypts a S/MIME encrypted MIME multipart and yields a new MIME body
+	 * Decrypts an S/MIME encrypted MIME multipart and yields a new MIME body
 	 * part.
 	 * 
 	 * @param mimeMultipart
@@ -274,7 +271,6 @@ private static byte[] decryptContent(SMIMEEnveloped smimeEnveloped, SmimeKey smi
 	}
 
 	private static void copyHeaderLines(MimeMessage fromMessage, MimeMessage toMessage) throws MessagingException {
-		@SuppressWarnings("unchecked")
 		Enumeration<String> headerLines = fromMessage.getAllHeaderLines();
 		while (headerLines.hasMoreElements()) {
 			String nextElement = headerLines.nextElement();
@@ -327,8 +323,7 @@ private static SignerInfoGenerator getInfoGenerator(SmimeKey smimeKey) throws Op
 
 		PrivateKey privateKey = smimeKey.getPrivateKey();
 		X509Certificate certificate = smimeKey.getCertificate();
-		SignerInfoGenerator infoGenerator = builder.build("SHA256withRSA", privateKey, certificate);
-		return infoGenerator;
+		return builder.build("SHA256withRSA", privateKey, certificate);
 	}
 
 	private static ASN1EncodableVector getSignedAttributes(SmimeKey smimeKey) {
@@ -351,19 +346,18 @@ private static IssuerAndSerialNumber getIssuerAndSerialNumber(SmimeKey smimeKey)
 		X509Certificate certificate = smimeKey.getCertificate();
 		BigInteger serialNumber = certificate.getSerialNumber();
 		X500Name issuerName = new X500Name(certificate.getIssuerDN().getName());
-		IssuerAndSerialNumber issuerAndSerialNumber = new IssuerAndSerialNumber(issuerName, serialNumber);
-		return issuerAndSerialNumber;
+		return new IssuerAndSerialNumber(issuerName, serialNumber);
 	}
 
 	private static JcaCertStore getCertificateStore(SmimeKey smimeKey) throws CertificateEncodingException {
 		Certificate[] certificateChain = smimeKey.getCertificateChain();
 		X509Certificate certificate = smimeKey.getCertificate();
 
-		List<Certificate> certificateList = null;
+		final List<Certificate> certificateList;
 		if (certificateChain != null && certificateChain.length > 0) {
 			certificateList = Arrays.asList(certificateChain);
 		} else {
-			certificateList = new ArrayList<Certificate>();
+			certificateList = new ArrayList<>();
 			certificateList.add(certificate);
 		}
 		return new JcaCertStore(certificateList);
@@ -383,6 +377,7 @@ private static JcaCertStore getCertificateStore(SmimeKey smimeKey) throws Certif
 	 * @return The new S/MIME signed {@link MimeMessage} or {@link SMTPMessage}.
 	 */
 	public static <T extends MimeMessage> T sign(Session session, T mimeMessage, SmimeKey smimeKey) {
+		//noinspection unchecked
 		return (mimeMessage instanceof SMTPMessage)
 				? sign(mimeMessage, (T) new SMTPMessage(session), smimeKey)
 				: sign(mimeMessage, (T) new MimeMessage(session), smimeKey);
@@ -411,7 +406,7 @@ private static MimeBodyPart extractMimeBodyPart(MimeMessage mimeMessage) throws
 	}
 
 	/**
-	 * Checks the signature on a S/MIME signed MIME multipart.
+	 * Checks the signature on an S/MIME signed MIME multipart.
 	 * 
 	 * @param mimeMultipart
 	 *            The {@link MimeMultipart} to be checked.
@@ -427,7 +422,7 @@ public static boolean checkSignature(MimeMultipart mimeMultipart) {
 	}
 
 	/**
-	 * Checks the signature on a S/MIME signed MIME part (i.e. MIME message).
+	 * Checks the signature on an S/MIME signed MIME part (i.e. MIME message).
 	 * 
 	 * @param mimePart
 	 *            The {@link MimePart} to be checked.
@@ -451,8 +446,7 @@ public static boolean checkSignature(MimePart mimePart) {
 	/**
 	 * Checks a SMIMESigned to make sure that the signature matches.
 	 */
-	private static boolean checkSignature(SMIMESigned smimeSigned) throws MessagingException, IOException,
-			GeneralSecurityException {
+	private static boolean checkSignature(SMIMESigned smimeSigned) {
 		try {
 			boolean returnValue = true;
 
@@ -547,7 +541,7 @@ private static SignerInformationVerifier getVerifier(X509Certificate certificate
 	}
 
 	/**
-	 * Returns the signed MIME body part of a S/MIME signed MIME multipart.
+	 * Returns the signed MIME body part of an S/MIME signed MIME multipart.
 	 * 
 	 * @param mimeMultipart
 	 *            The {@link MimeMultipart} to be stripped off.
@@ -563,7 +557,7 @@ public static MimeBodyPart getSignedContent(MimeMultipart mimeMultipart) {
 	}
 
 	/**
-	 * Returns the signed MIME body part of a S/MIME signed MIME part (i.e. MIME
+	 * Returns the signed MIME body part of an S/MIME signed MIME part (i.e. MIME
 	 * message).
 	 * 
 	 * @param mimePart

src/main/java/net/markenwerk/utils/mail/smime/UpdatableMimeBodyPart.java

@@ -2,7 +2,6 @@
 
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeBodyPart;
-import java.io.InputStream;
 
 /**
  * A {@link MimeBodyPart} that exposes the method {@code updateHeaders()} with
@@ -14,26 +13,6 @@
  */
 class UpdatableMimeBodyPart extends MimeBodyPart {
 
-	/**
-	 * Create a new {@code UpdatableMimeBodyPart}.
-	 */
-	public UpdatableMimeBodyPart() {
-		super();
-	}
-
-	/**
-	 * Create a new {@code UpdatableMimeBodyPart} by reading and parsing the
-	 * data from the specified input stream.
-	 * 
-	 * @param in
-	 *            The {@link InputStream} to be read.
-	 * @throws MessagingException
-	 *             If the {@code MimeBodyPart} couldn't be read.
-	 */
-	public UpdatableMimeBodyPart(InputStream in) throws MessagingException {
-		super(in);
-	}
-
 	/**
 	 * Calls updateHeaders().
 	 */