Switched from MiscUtil.checkNotNull to Objects.requireNotNull

Author: bbottema

modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5client/KeyStoreInfo.java

@@ -1,6 +1,6 @@
 package org.simplejavamail.internal.authenticatedsockssupport.socks5client;
 
-import org.simplejavamail.internal.util.MiscUtil;
+import static java.util.Objects.requireNonNull;
 
 @SuppressWarnings("SameParameterValue")
 class KeyStoreInfo {
@@ -18,9 +18,9 @@ public KeyStoreInfo(final String keyStorePath, final String password) {
 	}
 
 	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");
+		this.keyStorePath = requireNonNull(keyStorePath, "Argument [keyStorePath] may not be null");
+		this.password = requireNonNull(password, "Argument [password] may not be null");
+		this.type = requireNonNull(type, "Argument [type] may not be null");
 	}
 
 	public String getKeyStorePath() {

modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5client/ProxyCredentials.java

@@ -1,6 +1,6 @@
 package org.simplejavamail.internal.authenticatedsockssupport.socks5client;
 
-import org.simplejavamail.internal.util.MiscUtil;
+import static java.util.Objects.requireNonNull;
 
 public class ProxyCredentials {
 
@@ -13,7 +13,7 @@ public ProxyCredentials() {
 
 	public ProxyCredentials(final String username, final String password) {
 		this.username = username;
-		this.password = MiscUtil.checkNotNull(password, "Argument [password] may not be null");
+        this.password = requireNonNull(password, "Argument [password] may not be null");
 	}
 
 	public String getUsername() {

modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5client/SSLConfiguration.java

@@ -1,7 +1,6 @@
 package org.simplejavamail.internal.authenticatedsockssupport.socks5client;
 
 import org.simplejavamail.internal.authenticatedsockssupport.common.SocksException;
-import org.simplejavamail.internal.util.MiscUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,6 +17,8 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 
+import static java.util.Objects.requireNonNull;
+
 class SSLConfiguration {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(SSLConfiguration.class);
@@ -33,8 +34,8 @@ private SSLConfiguration(final KeyStoreInfo keyStoreInfo, final KeyStoreInfo tru
 
 	public SSLSocketFactory getSSLSocketFactory()
 			throws SocksException {
-		MiscUtil.checkNotNull(trustKeyStoreInfo, "trustKeyStoreInfo may not be null");
-		FileInputStream s1 = null;
+        requireNonNull(trustKeyStoreInfo, "trustKeyStoreInfo may not be null");
+        FileInputStream s1 = null;
 		FileInputStream s2 = null;
 		try {
 			final SSLContext context = SSLContext.getInstance("SSL");

modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5client/SocksAuthenticationHelper.java

@@ -11,6 +11,7 @@
 import java.net.Socket;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 
 final class SocksAuthenticationHelper {
 	private static final Logger LOGGER = LoggerFactory.getLogger(SocksAuthenticationHelper.class);
@@ -56,8 +57,8 @@ public static boolean shouldAuthenticate(final Socket socket)
 
 	public static void performUserPasswordAuthentication(final Socks5 socksProxy)
 			throws IOException {
-		MiscUtil.checkNotNull(socksProxy, "Argument [socksProxy] may not be null");
-		final ProxyCredentials credentials = socksProxy.getCredentials();
+        requireNonNull(socksProxy, "Argument [socksProxy] may not be null");
+        final ProxyCredentials credentials = socksProxy.getCredentials();
 		if (credentials == null) {
 			throw new SocksException("Need Username/Password authentication");
 		}

modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5client/SocksSocket.java

@@ -2,7 +2,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.internal.authenticatedsockssupport.common.SocksException;
-import org.simplejavamail.internal.util.MiscUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,9 +34,9 @@ public class SocksSocket extends Socket {
 
 	private SocksSocket(final Socks5 proxy, final String remoteServerHost, final int remoteServerPort)
 			throws IOException {
-		this.proxy = MiscUtil.checkNotNull(proxy, "Argument [proxy] may not be null").copy();
+        this.proxy = requireNonNull(proxy, "Argument [proxy] may not be null").copy();
 		this.proxy.setProxySocket(proxySocket);
-		this.remoteServerHost = MiscUtil.checkNotNull(remoteServerHost, "Argument [remoteServerHost] may not be null");
+        this.remoteServerHost = requireNonNull(remoteServerHost, "Argument [remoteServerHost] may not be null");
 		this.remoteServerPort = remoteServerPort;
 		this.proxy.buildConnection();
 		proxySocket = this.proxy.getProxySocket();
@@ -52,9 +51,9 @@ private SocksSocket(final Socks5 proxy, final InetAddress address, final int por
 
 	public SocksSocket(final Socks5 proxy, final InetSocketAddress socketAddress)
 			throws IOException {
-		MiscUtil.checkNotNull(proxy, "Argument [proxy] may not be null");
-		MiscUtil.checkNotNull(socketAddress, "Argument [socketAddress] may not be null");
-		this.proxy = proxy.copy();
+        requireNonNull(proxy, "Argument [proxy] may not be null");
+        requireNonNull(socketAddress, "Argument [socketAddress] may not be null");
+        this.proxy = proxy.copy();
 		this.remoteServerHost = socketAddress.getHostString();
 		this.remoteServerPort = socketAddress.getPort();
 		this.proxy.buildConnection();
@@ -77,9 +76,9 @@ public SocksSocket(final Socks5 proxy, final Socket proxySocket, final InetSocke
 
 	@SuppressWarnings("WeakerAccess")
 	public SocksSocket(final Socks5 proxy, final Socket proxySocket) {
-		MiscUtil.checkNotNull(proxy, "Argument [proxy] may not be null");
-		MiscUtil.checkNotNull(proxySocket, "Argument [proxySocket] may not be null");
-		if (proxySocket.isConnected()) {
+        requireNonNull(proxy, "Argument [proxy] may not be null");
+        requireNonNull(proxySocket, "Argument [proxySocket] may not be null");
+        if (proxySocket.isConnected()) {
 			throw new IllegalArgumentException("Proxy socket should be unconnected");
 		}
 		this.proxySocket = proxySocket;

modules/core-module/src/main/java/org/simplejavamail/internal/util/MiscUtil.java

@@ -1,6 +1,5 @@
 package org.simplejavamail.internal.util;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import jakarta.activation.DataSource;
 import jakarta.activation.FileDataSource;
 import jakarta.activation.URLDataSource;
@@ -52,14 +51,6 @@ public final class MiscUtil {
 
 	private static final Random RANDOM = new Random();
 
-	@SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE")
-	public static <T> T checkNotNull(final @Nullable T value, final @Nullable String msg) {
-		if (value == null) {
-			throw new NullPointerException(msg);
-		}
-		return value;
-	}
-
 	public static <T> T checkArgumentNotEmpty(final @Nullable T value, final @Nullable String msg) {
 		if (valueNullOrEmpty(value)) {
 			throw new IllegalArgumentException(msg);

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java

@@ -51,6 +51,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static java.util.Objects.requireNonNull;
 import static java.util.regex.Matcher.quoteReplacement;
 import static org.simplejavamail.config.ConfigLoader.Property.DEFAULT_BCC_ADDRESS;
 import static org.simplejavamail.config.ConfigLoader.Property.DEFAULT_BCC_NAME;
@@ -90,7 +91,6 @@
 import static org.simplejavamail.email.internal.EmailException.ERROR_RESOLVING_IMAGE_DATASOURCE;
 import static org.simplejavamail.email.internal.EmailException.NAME_MISSING_FOR_EMBEDDED_IMAGE;
 import static org.simplejavamail.internal.smimesupport.SmimeRecognitionUtil.isGeneratedSmimeMessageId;
-import static org.simplejavamail.internal.util.MiscUtil.checkNotNull;
 import static org.simplejavamail.internal.util.MiscUtil.defaultTo;
 import static org.simplejavamail.internal.util.MiscUtil.extractEmailAddresses;
 import static org.simplejavamail.internal.util.MiscUtil.randomCid10;
@@ -1735,7 +1735,7 @@ public EmailPopulatingBuilder withAttachment(@Nullable final String name, @NotNu
 	 */
 	@Override
 	public EmailPopulatingBuilder withAttachment(@Nullable final String name, @NotNull final byte[] data, @NotNull final String mimetype, @Nullable final String description, @Nullable final ContentTransferEncoding contentTransferEncoding) {
-		checkNotNull(data, "data");
+		requireNonNull(data, "data");
 		checkNonEmptyArgument(mimetype, "mimetype");
 		final ByteArrayDataSource dataSource = new ByteArrayDataSource(data, mimetype);
 		dataSource.setName(name);

modules/simple-java-mail/src/test/java/org/simplejavamail/internal/util/MiscUtilTest.java

@@ -17,19 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class MiscUtilTest {
-	@Test
-	@SuppressWarnings("ObviousNullCheck")
-	public void checkNotNull() {
-		assertThat(MiscUtil.checkNotNull("", null)).isEqualTo("");
-		assertThat(MiscUtil.checkNotNull("blah", null)).isEqualTo("blah");
-		assertThat(MiscUtil.checkNotNull(23523, null)).isEqualTo(23523);
-	}
-	
-	@Test(expected = NullPointerException.class)
-	public void checkNotNullWithException() {
-		MiscUtil.checkNotNull(null, null);
-	}
-	
+
 	@Test
 	public void checkArgumentNotEmpty() {
 		assertThat(MiscUtil.checkArgumentNotEmpty("blah", null)).isEqualTo("blah");