* Replace with <>.

* Simplify conditions and avoid extra checks.
* Use java array.

pom.xml

@@ -271,6 +271,9 @@ The following provides more details on the included cryptographic software:
       <name>Adam Retter</name>
       <organization>Evolved Binary</organization>
     </contributor>
+    <contributor>
+      <name>Arturo Bernal</name>
+    </contributor>
   </contributors>
 
   <profiles>

src/main/java/org/apache/commons/crypto/Crypto.java

@@ -146,7 +146,7 @@ public static boolean isNativeCodeLoaded() {
      * @param args Not used.
      * @throws Exception if getCryptoRandom or getCryptoCipher get error.
      */
-    public static void main(final String args[]) throws Exception {
+    public static void main(final String[] args) throws Exception {
         info("%s %s", getComponentName(), getComponentVersion());
         if (isNativeCodeLoaded()) {
             info("Native code loaded OK: %s", OpenSslInfoNative.NativeVersion());

src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java

@@ -160,9 +160,7 @@ public static CryptoCipher getCryptoCipher(final String transformation, final Pr
                 final Class<?> cls = ReflectionUtils.getClassByName(klass);
                 cipher = ReflectionUtils.newInstance(cls.asSubclass
                         (CryptoCipher.class), properties, transformation);
-                if (cipher != null) {
-                    break;
-                }
+                break;
             } catch (final Exception e) {
                 lastException = e;
                 errorMessage.append("{" + klass + "}");

src/main/java/org/apache/commons/crypto/jna/OpenSsl10XNativeJna.java

@@ -161,7 +161,7 @@ class OpenSsl10XNativeJna {
      * @return 1 for success and 0 for failure.
      */
     public static native int EVP_CipherInit_ex(PointerByReference ctx, PointerByReference cipher,
-            PointerByReference impl, byte key[], byte iv[], int enc);
+            PointerByReference impl, byte[] key, byte[] iv, int enc);
 
     /**
      * Continues a multiple-part encryption/decryption operation.

src/main/java/org/apache/commons/crypto/jna/OpenSsl11XNativeJna.java

@@ -133,7 +133,7 @@ class OpenSsl11XNativeJna {
      * @return 1 for success and 0 for failure.
      */
     public static native int EVP_CipherInit_ex(PointerByReference ctx, PointerByReference cipher,
-            PointerByReference impl, byte key[], byte iv[], int enc);
+            PointerByReference impl, byte[] key, byte[] iv, int enc);
 
     /**
      * Continues a multiple-part encryption/decryption operation.

src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java

@@ -142,7 +142,7 @@ public void setSeed(final long seed) {
     final protected int next(final int numBits) {
         Utils.checkArgument(numBits >= 0 && numBits <= 32);
         final int numBytes = (numBits + 7) / 8;
-        final byte b[] = new byte[numBytes];
+        final byte[] b = new byte[numBytes];
         int next = 0;
 
         nextBytes(b);

src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java

@@ -196,9 +196,7 @@ public static CryptoRandom getCryptoRandom(final Properties props)
             try {
                 final Class<?> klass = ReflectionUtils.getClassByName(klassName);
                 random = (CryptoRandom) ReflectionUtils.newInstance(klass, props);
-                if (random != null) {
-                    break;
-                }
+                break;
             } catch (final ClassCastException e) {
                 lastException = e;
                 errorMessage.append("Class: [" + klassName + "] is not a CryptoRandom.");

src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java

@@ -132,7 +132,7 @@ public void setSeed(final long seed) {
     final protected int next(final int numBits) {
         Utils.checkArgument(numBits >= 0 && numBits <= 32);
         final int numBytes = (numBits + 7) / 8;
-        final byte b[] = new byte[numBytes];
+        final byte[] b = new byte[numBytes];
         int next = 0;
 
         nextBytes(b);

src/main/java/org/apache/commons/crypto/utils/IoUtils.java

@@ -43,7 +43,7 @@ private IoUtils() {
      * @param len the maximum number of bytes to read.
      * @throws IOException if an I/O error occurs.
      */
-    public static void readFully(final InputStream in, final byte buf[], int off, final int len)
+    public static void readFully(final InputStream in, final byte[] buf, int off, final int len)
             throws IOException {
         int toRead = len;
         while (toRead > 0) {

src/main/java/org/apache/commons/crypto/utils/ReflectionUtils.java

@@ -117,7 +117,7 @@ private static Class<?> getClassByNameOrNull(final String name) {
         final Map<String, WeakReference<Class<?>>> map;
 
         synchronized (CACHE_CLASSES) {
-            map = CACHE_CLASSES.computeIfAbsent(CLASSLOADER, k -> Collections.synchronizedMap(new WeakHashMap<String, WeakReference<Class<?>>>()));
+            map = CACHE_CLASSES.computeIfAbsent(CLASSLOADER, k -> Collections.synchronizedMap(new WeakHashMap<>()));
         }
 
         Class<?> clazz = null;
@@ -131,11 +131,11 @@ private static Class<?> getClassByNameOrNull(final String name) {
                 clazz = Class.forName(name, true, CLASSLOADER);
             } catch (final ClassNotFoundException e) {
                 // Leave a marker that the class isn't found
-                map.put(name, new WeakReference<Class<?>>(NEGATIVE_CACHE_SENTINEL));
+                map.put(name, new WeakReference<>(NEGATIVE_CACHE_SENTINEL));
                 return null;
             }
             // two putters can race here, but they'll put the same class
-            map.put(name, new WeakReference<Class<?>>(clazz));
+            map.put(name, new WeakReference<>(clazz));
             return clazz;
         } else if (clazz == NEGATIVE_CACHE_SENTINEL) {
             return null; // not found