[commons-crypto] branch master updated: Use Object.requireNotNull() instead of custom version.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git


The following commit(s) were added to refs/heads/master by this push:
     new ca9a6bb  Use Object.requireNotNull() instead of custom version.
ca9a6bb is described below

commit ca9a6bb46ba12cc130161e83a243cf6afab1dcef
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jan 26 16:04:24 2020 -0500

    Use Object.requireNotNull() instead of custom version.
---
 src/main/java/org/apache/commons/crypto/cipher/JceCipher.java     | 7 +++----
 src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java | 8 ++++----
 src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java | 6 +++---
 src/main/java/org/apache/commons/crypto/utils/Utils.java          | 2 ++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java 
b/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java
index c06ab49..a2980d9 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java
@@ -23,6 +23,7 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.spec.AlgorithmParameterSpec;
+import java.util.Objects;
 import java.util.Properties;
 
 import javax.crypto.BadPaddingException;
@@ -30,8 +31,6 @@ import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.ShortBufferException;
 
-import org.apache.commons.crypto.utils.Utils;
-
 /**
  * Implements the {@link CryptoCipher} using JCE provider.
  */
@@ -98,8 +97,8 @@ class JceCipher implements CryptoCipher {
     @Override
     public void init(int mode, Key key, AlgorithmParameterSpec params)
             throws InvalidKeyException, InvalidAlgorithmParameterException {
-        Utils.checkNotNull(key);
-        Utils.checkNotNull(params);
+        Objects.requireNonNull(key, "key");
+        Objects.requireNonNull(params, "params");
 
         // Jce uses the javax.crypto.Cipher modes; no need to convert the input
         cipher.init(mode, key, params);
diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java 
b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java
index 14dbeaa..a149f70 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java
@@ -23,14 +23,14 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.spec.AlgorithmParameterSpec;
+import java.util.Objects;
 import java.util.Properties;
+
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.ShortBufferException;
 
-import org.apache.commons.crypto.utils.Utils;
-
 /**
  * Implements the CryptoCipher using JNI into OpenSSL.
  */
@@ -99,8 +99,8 @@ class OpenSslCipher implements CryptoCipher {
     @Override
     public void init(int mode, Key key, AlgorithmParameterSpec params)
             throws InvalidKeyException, InvalidAlgorithmParameterException {
-        Utils.checkNotNull(key);
-        Utils.checkNotNull(params);
+        Objects.requireNonNull(key, "key");
+        Objects.requireNonNull(params, "params");
 
         int cipherMode = OpenSsl.DECRYPT_MODE;
         if (mode == Cipher.ENCRYPT_MODE) {
diff --git a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java 
b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java
index 68a217f..4204745 100644
--- a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java
+++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java
@@ -24,6 +24,7 @@ import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.AlgorithmParameterSpec;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
@@ -36,7 +37,6 @@ import javax.crypto.spec.IvParameterSpec;
 
 import org.apache.commons.crypto.cipher.CryptoCipher;
 import org.apache.commons.crypto.cipher.CryptoCipherFactory;
-import org.apache.commons.crypto.utils.Utils;
 
 import com.sun.jna.NativeLong;
 import com.sun.jna.ptr.PointerByReference;
@@ -89,8 +89,8 @@ class OpenSslJnaCipher implements CryptoCipher {
     @Override
     public void init(int mode, Key key, AlgorithmParameterSpec params)
             throws InvalidKeyException, InvalidAlgorithmParameterException {
-        Utils.checkNotNull(key);
-        Utils.checkNotNull(params);
+        Objects.requireNonNull(key, "key");
+        Objects.requireNonNull(params, "params");
         int cipherMode = OpenSslNativeJna.OOSL_JNA_DECRYPT_MODE;
         if (mode == Cipher.ENCRYPT_MODE) {
             cipherMode = OpenSslNativeJna.OOSL_JNA_ENCRYPT_MODE;
diff --git a/src/main/java/org/apache/commons/crypto/utils/Utils.java 
b/src/main/java/org/apache/commons/crypto/utils/Utils.java
index 03d5f15..1106912 100644
--- a/src/main/java/org/apache/commons/crypto/utils/Utils.java
+++ b/src/main/java/org/apache/commons/crypto/utils/Utils.java
@@ -168,7 +168,9 @@ public final class Utils {
      * @param reference an object reference.
      * @return the non-null reference that was validated.
      * @throws NullPointerException if reference is null.
+     * @deprecated Use {@link Objects#requireNonNull(Object)}.
      */
+    @Deprecated
     public static <T> T checkNotNull(T reference) {
         return Objects.requireNonNull(reference, "reference");
     }