Repository: commons-crypto Updated Branches: refs/heads/master f07c2bc04 -> af7272f10
No need to nest in else clauses. Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/af7272f1 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/af7272f1 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/af7272f1 Branch: refs/heads/master Commit: af7272f103c889964fa3fc01482bbd68b6b5e445 Parents: f07c2bc Author: ggregory <[email protected]> Authored: Thu Jun 9 15:07:06 2016 -0700 Committer: ggregory <[email protected]> Committed: Thu Jun 9 15:07:06 2016 -0700 ---------------------------------------------------------------------- .../crypto/stream/CTRCryptoInputStream.java | 12 ++++----- .../crypto/stream/CryptoInputStream.java | 27 +++++++++----------- .../org/apache/commons/crypto/utils/Utils.java | 6 ++--- .../crypto/stream/AbstractCipherStreamTest.java | 10 +++----- .../crypto/stream/CTRCryptoStreamTest.java | 6 ++--- 5 files changed, 25 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af7272f1/src/main/java/org/apache/commons/crypto/stream/CTRCryptoInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/stream/CTRCryptoInputStream.java b/src/main/java/org/apache/commons/crypto/stream/CTRCryptoInputStream.java index b357000..f2df802 100644 --- a/src/main/java/org/apache/commons/crypto/stream/CTRCryptoInputStream.java +++ b/src/main/java/org/apache/commons/crypto/stream/CTRCryptoInputStream.java @@ -314,11 +314,10 @@ public class CTRCryptoInputStream extends CryptoInputStream { decryptInPlace(buf); padding = postDecryption(streamOffset); return n; - } else { - // Use outBuffer as the output buffer - decrypt(); - padding = postDecryption(streamOffset); } + // Use outBuffer as the output buffer + decrypt(); + padding = postDecryption(streamOffset); } // Copy decrypted data from outBuffer to buf @@ -330,10 +329,9 @@ public class CTRCryptoInputStream extends CryptoInputStream { buf.put(outBuffer); outBuffer.limit(limit); return toRead; - } else { - buf.put(outBuffer); - return unread; } + buf.put(outBuffer); + return unread; } /** http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af7272f1/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java b/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java index edf3e7f..c720991 100644 --- a/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java +++ b/src/main/java/org/apache/commons/crypto/stream/CryptoInputStream.java @@ -231,16 +231,15 @@ public class CryptoInputStream extends InputStream implements int n = Math.min(len, remaining); outBuffer.get(b, off, n); return n; - } else { - // No data in the out buffer, try read new data and decrypt it - int nd = decryptMore(); - if (nd <= 0) - return nd; - - int n = Math.min(len, outBuffer.remaining()); - outBuffer.get(b, off, n); - return n; } + // No data in the out buffer, try read new data and decrypt it + int nd = decryptMore(); + if (nd <= 0) + return nd; + + int n = Math.min(len, outBuffer.remaining()); + outBuffer.get(b, off, n); + return n; } /** @@ -271,10 +270,9 @@ public class CryptoInputStream extends InputStream implements remaining = 0; break; - } else { - remaining -= outBuffer.remaining(); - outBuffer.clear(); } + remaining -= outBuffer.remaining(); + outBuffer.clear(); nd = decryptMore(); if (nd < 0) { @@ -396,10 +394,9 @@ public class CryptoInputStream extends InputStream implements dst.put(outBuffer); outBuffer.limit(limit); return toRead; - } else { - dst.put(outBuffer); - return remaining; } + dst.put(outBuffer); + return remaining; } /** http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af7272f1/src/main/java/org/apache/commons/crypto/utils/Utils.java ---------------------------------------------------------------------- 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 17c98c2..6d9ca3b 100644 --- a/src/main/java/org/apache/commons/crypto/utils/Utils.java +++ b/src/main/java/org/apache/commons/crypto/utils/Utils.java @@ -128,9 +128,8 @@ public class Utils { } if (bufferSizeStr == null || bufferSizeStr.isEmpty()) { return COMMONS_CRYPTO_STREAM_BUFFER_SIZE_DEFAULT; - } else { - return Integer.parseInt(bufferSizeStr); } + return Integer.parseInt(bufferSizeStr); } /** @@ -339,9 +338,8 @@ public class Utils { public static <T> T checkNotNull(T reference) { if (reference == null) { throw new NullPointerException(); - } else { - return reference; } + return reference; } /** http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af7272f1/src/test/java/org/apache/commons/crypto/stream/AbstractCipherStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/crypto/stream/AbstractCipherStreamTest.java b/src/test/java/org/apache/commons/crypto/stream/AbstractCipherStreamTest.java index feb318d..a9d6fef 100644 --- a/src/test/java/org/apache/commons/crypto/stream/AbstractCipherStreamTest.java +++ b/src/test/java/org/apache/commons/crypto/stream/AbstractCipherStreamTest.java @@ -269,10 +269,9 @@ public abstract class AbstractCipherStreamTest { return new CryptoInputStream(Channels.newChannel(bais), cipher, bufferSize, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv)); - } else { - return new CryptoInputStream(bais, cipher, bufferSize, - new SecretKeySpec(key, "AES"), new IvParameterSpec(iv)); } + return new CryptoInputStream(bais, cipher, bufferSize, + new SecretKeySpec(key, "AES"), new IvParameterSpec(iv)); } protected CryptoOutputStream getCryptoOutputStream( @@ -282,10 +281,9 @@ public abstract class AbstractCipherStreamTest { return new CryptoOutputStream(Channels.newChannel(baos), cipher, bufferSize, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv)); - } else { - return new CryptoOutputStream(baos, cipher, bufferSize, - new SecretKeySpec(key, "AES"), new IvParameterSpec(iv)); } + return new CryptoOutputStream(baos, cipher, bufferSize, + new SecretKeySpec(key, "AES"), new IvParameterSpec(iv)); } private int readAll(InputStream in, byte[] b, int offset, int len) http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/af7272f1/src/test/java/org/apache/commons/crypto/stream/CTRCryptoStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/crypto/stream/CTRCryptoStreamTest.java b/src/test/java/org/apache/commons/crypto/stream/CTRCryptoStreamTest.java index ad8220b..4a87a9b 100644 --- a/src/test/java/org/apache/commons/crypto/stream/CTRCryptoStreamTest.java +++ b/src/test/java/org/apache/commons/crypto/stream/CTRCryptoStreamTest.java @@ -39,9 +39,8 @@ public class CTRCryptoStreamTest extends AbstractCipherStreamTest { if (withChannel) { return new CTRCryptoInputStream(Channels.newChannel(bais), cipher, bufferSize, key, iv); - } else { - return new CTRCryptoInputStream(bais, cipher, bufferSize, key, iv); } + return new CTRCryptoInputStream(bais, cipher, bufferSize, key, iv); } @Override @@ -51,8 +50,7 @@ public class CTRCryptoStreamTest extends AbstractCipherStreamTest { if (withChannel) { return new CTRCryptoOutputStream(Channels.newChannel(baos), cipher, bufferSize, key, iv); - } else { - return new CTRCryptoOutputStream(baos, cipher, bufferSize, key, iv); } + return new CTRCryptoOutputStream(baos, cipher, bufferSize, key, iv); } }
