CRYPTO-118: Fix pmd and findbugs issues
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/5a3bf996 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/5a3bf996 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/5a3bf996 Branch: refs/heads/CRYPTO-1.0.0 Commit: 5a3bf996afa6c7c44ed4aefd5e54b7629f56c075 Parents: 7eac68d Author: Sun Dapeng <s...@apache.org> Authored: Thu Jul 21 11:03:32 2016 +0800 Committer: Sun Dapeng <s...@apache.org> Committed: Fri Jul 22 14:38:40 2016 +0800 ---------------------------------------------------------------------- findbugs-exclude.xml | 5 +++++ src/main/java/org/apache/commons/crypto/Crypto.java | 2 +- .../org/apache/commons/crypto/cipher/CryptoCipherFactory.java | 1 - .../java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java | 2 +- .../org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java | 2 +- .../org/apache/commons/crypto/random/CryptoRandomFactory.java | 1 - .../org/apache/commons/crypto/random/OpenSslCryptoRandom.java | 2 +- .../org/apache/commons/crypto/random/OsCryptoRandomTest.java | 6 ++---- 8 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/5a3bf996/findbugs-exclude.xml ---------------------------------------------------------------------- diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml index 82fc9b2..29f446a 100644 --- a/findbugs-exclude.xml +++ b/findbugs-exclude.xml @@ -55,5 +55,10 @@ <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD,UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"/> </Match> + <Match> + <Class name="org.apache.commons.crypto.NativeCodeLoader" /> + <Method name="extractLibraryFile" /> + <Bug pattern="OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE" /> + </Match> </FindBugsFilter> http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/5a3bf996/src/main/java/org/apache/commons/crypto/Crypto.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/Crypto.java b/src/main/java/org/apache/commons/crypto/Crypto.java index 7c86ee8..d72fa4e 100644 --- a/src/main/java/org/apache/commons/crypto/Crypto.java +++ b/src/main/java/org/apache/commons/crypto/Crypto.java @@ -63,7 +63,7 @@ public final class Crypto { try (InputStream openStream = url.openStream()) { versionData.load(openStream); return versionData; - } catch (IOException e) { + } catch (IOException e) { // NOPMD } } return new Properties(); // make sure field is not null http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/5a3bf996/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java index c34753a..2fa6346 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java +++ b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java @@ -56,7 +56,6 @@ public class CryptoCipherFactory { * Defines the internal CryptoCipher implementations. * <p> * Usage: - * <p> * <blockquote><pre> * props.setProperty(CryptoCipherFactory.CLASSES_KEY, CipherProvider.OPENSSL.getClassName()); * props.setProperty(...); // if required by the implementation http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/5a3bf996/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java ---------------------------------------------------------------------- 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 f8ba94f..e9a0588 100644 --- a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java +++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCipher.java @@ -59,7 +59,7 @@ class OpenSslJnaCipher implements CryptoCipher { * @param transformation transformation for OpenSSL cipher * @throws GeneralSecurityException if OpenSSL cipher initialize failed */ - public OpenSslJnaCipher(Properties props, String transformation) + public OpenSslJnaCipher(Properties props, String transformation) // NOPMD throws GeneralSecurityException { if (!OpenSslJna.isEnabled()) { throw new GeneralSecurityException("Could not enable JNA access", OpenSslJna.initialisationError()); http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/5a3bf996/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java index aa245e6..c9c0419 100644 --- a/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java +++ b/src/main/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandom.java @@ -57,7 +57,7 @@ class OpenSslJnaCryptoRandom extends Random implements CryptoRandom { * @param props the configuration properties (not used) * @throws GeneralSecurityException if could not enable JNA access */ - public OpenSslJnaCryptoRandom(Properties props) + public OpenSslJnaCryptoRandom(Properties props) //NOPMD throws GeneralSecurityException { if (!OpenSslJna.isEnabled()) { throw new GeneralSecurityException("Could not enable JNA access", OpenSslJna.initialisationError()); http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/5a3bf996/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java index 853a079..5416cc7 100644 --- a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java +++ b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java @@ -74,7 +74,6 @@ public class CryptoRandomFactory { * Defines the internal CryptoRandom implementations. * <p> * Usage: - * <p> * <blockquote><pre> * props.setProperty(CryptoRandomFactory.CLASSES_KEY, RandomProvider.OPENSSL.getClassName()); * props.setProperty(...); // if required by the implementation http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/5a3bf996/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java b/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java index 54c0697..8c9f48b 100644 --- a/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java +++ b/src/main/java/org/apache/commons/crypto/random/OpenSslCryptoRandom.java @@ -82,7 +82,7 @@ class OpenSslCryptoRandom extends Random implements CryptoRandom { */ // N.B. this class is not public/protected so does not appear in the main Javadoc // Please ensure that property use is documented in the enum CryptoRandomFactory.RandomProvider - public OpenSslCryptoRandom(Properties props) throws GeneralSecurityException { + public OpenSslCryptoRandom(Properties props) throws GeneralSecurityException { // NOPMD if (!nativeEnabled) { if (initException != null) { throw new GeneralSecurityException("Native library could not be initialised", initException); http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/5a3bf996/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java b/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java index 6382771..4b6e922 100644 --- a/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java +++ b/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java @@ -17,17 +17,15 @@ */ package org.apache.commons.crypto.random; -import static org.junit.Assert.fail; - import java.io.FileNotFoundException; import java.lang.reflect.InvocationTargetException; import java.security.GeneralSecurityException; import java.util.Properties; +import org.junit.Assert; import org.junit.Assume; import org.junit.Test; - -import junit.framework.Assert; +import static org.junit.Assert.fail; public class OsCryptoRandomTest extends AbstractRandomTest {
