You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/03/05 21:05:21 UTC
[commons-compress] 01/05: No need to nest in else.
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-compress.git
commit 768722d6587f42354a95df02c493128a9fee28c7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Mar 5 15:48:36 2021 -0500
No need to nest in else.
---
.../compress/archivers/ArchiveStreamFactory.java | 15 ++--
.../archivers/ar/ArArchiveOutputStream.java | 3 +-
.../archivers/cpio/CpioArchiveInputStream.java | 3 +-
.../archivers/cpio/CpioArchiveOutputStream.java | 3 +-
.../compress/archivers/dump/DumpArchiveEntry.java | 3 +-
.../compress/archivers/sevenz/SevenZFile.java | 5 +-
.../archivers/tar/TarArchiveOutputStream.java | 3 +-
.../commons/compress/archivers/tar/TarUtils.java | 8 +-
.../commons/compress/archivers/zip/BinaryTree.java | 5 +-
.../archivers/zip/ExplodingInputStream.java | 3 +-
.../archivers/zip/UnshrinkingInputStream.java | 36 ++++-----
.../compress/archivers/zip/X7875_NewUnix.java | 5 +-
.../archivers/zip/ZipArchiveInputStream.java | 27 ++++---
.../commons/compress/archivers/zip/ZipUtil.java | 3 +-
.../bzip2/BZip2CompressorInputStream.java | 44 +++++------
.../bzip2/BZip2CompressorOutputStream.java | 15 ++--
.../compress/compressors/bzip2/BlockSort.java | 88 +++++++++++-----------
.../gzip/GzipCompressorOutputStream.java | 3 +-
.../lz4/BlockLZ4CompressorOutputStream.java | 10 +--
.../snappy/FramedSnappyCompressorInputStream.java | 3 +-
.../compressors/z/ZCompressorInputStream.java | 20 ++---
.../compressors/DetectCompressorTestCase.java | 3 +-
22 files changed, 159 insertions(+), 149 deletions(-)
diff --git a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
index 48527c3..82d6afa 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
@@ -501,15 +501,20 @@ public class ArchiveStreamFactory implements ArchiveStreamProvider {
if (ZipArchiveInputStream.matches(signature, signatureLength)) {
return ZIP;
- } else if (JarArchiveInputStream.matches(signature, signatureLength)) {
+ }
+ if (JarArchiveInputStream.matches(signature, signatureLength)) {
return JAR;
- } else if (ArArchiveInputStream.matches(signature, signatureLength)) {
+ }
+ if (ArArchiveInputStream.matches(signature, signatureLength)) {
return AR;
- } else if (CpioArchiveInputStream.matches(signature, signatureLength)) {
+ }
+ if (CpioArchiveInputStream.matches(signature, signatureLength)) {
return CPIO;
- } else if (ArjArchiveInputStream.matches(signature, signatureLength)) {
+ }
+ if (ArjArchiveInputStream.matches(signature, signatureLength)) {
return ARJ;
- } else if (SevenZFile.matches(signature, signatureLength)) {
+ }
+ if (SevenZFile.matches(signature, signatureLength)) {
return SEVEN_Z;
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
index 141eb4b..2de91ca 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
@@ -246,7 +246,8 @@ public class ArArchiveOutputStream extends ArchiveOutputStream {
public void finish() throws IOException {
if(haveUnclosedEntry) {
throw new IOException("This archive contains unclosed entries.");
- } else if(finished) {
+ }
+ if(finished) {
throw new IOException("This archive has already been finished");
}
finished = true;
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
index b4bf39d..9316bbf 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
@@ -306,7 +306,8 @@ public class CpioArchiveInputStream extends ArchiveInputStream implements
ensureOpen();
if (off < 0 || len < 0 || off > b.length - len) {
throw new IndexOutOfBoundsException();
- } else if (len == 0) {
+ }
+ if (len == 0) {
return 0;
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
index f5586e1..e605c32 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
@@ -425,7 +425,8 @@ public class CpioArchiveOutputStream extends ArchiveOutputStream implements
ensureOpen();
if (off < 0 || len < 0 || off > b.length - len) {
throw new IndexOutOfBoundsException();
- } else if (len == 0) {
+ }
+ if (len == 0) {
return;
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
index 86558e8..02643fa 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
@@ -403,7 +403,8 @@ public class DumpArchiveEntry implements ArchiveEntry {
public boolean equals(final Object o) {
if (o == this) {
return true;
- } else if (o == null || !o.getClass().equals(getClass())) {
+ }
+ if (o == null || !o.getClass().equals(getClass())) {
return false;
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
index a3cd53f..5c34386 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
@@ -536,11 +536,10 @@ public class SevenZFile implements Closeable {
archive = new Archive();
nid = getUnsignedByte(buf);
}
- if (nid == NID.kHeader) {
- readHeader(buf, archive);
- } else {
+ if (nid != NID.kHeader) {
throw new IOException("Broken or unsupported archive: no Header");
}
+ readHeader(buf, archive);
return archive;
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
index 21aed27..1645957 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
@@ -685,7 +685,8 @@ public class TarArchiveOutputStream extends ArchiveOutputStream {
if (longFileMode == LONGFILE_POSIX) {
paxHeaders.put(paxHeaderName, name);
return true;
- } else if (longFileMode == LONGFILE_GNU) {
+ }
+ if (longFileMode == LONGFILE_GNU) {
// create a TarEntry for the LongLink, the contents
// of which are the link's name
final TarArchiveEntry longLinkEntry = new TarArchiveEntry(TarConstants.GNU_LONGLINK,
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
index 8ffc79d..aaa882c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarUtils.java
@@ -128,11 +128,10 @@ public class TarUtils {
// Skip leading spaces
while (start < end){
- if (buffer[start] == ' '){
- start++;
- } else {
+ if (buffer[start] != ' ') {
break;
}
+ start++;
}
// Trim all trailing NULs and spaces.
@@ -673,7 +672,8 @@ public class TarUtils {
read++;
if (ch == '\n') { // blank line in header
break;
- } else if (ch == ' '){ // End of length string
+ }
+ if (ch == ' '){ // End of length string
// Get keyword
final ByteArrayOutputStream coll = new ByteArrayOutputStream();
while((ch = inputStream.read()) != -1) {
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/BinaryTree.java b/src/main/java/org/apache/commons/compress/archivers/zip/BinaryTree.java
index c141973..31153e1 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/BinaryTree.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/BinaryTree.java
@@ -66,11 +66,10 @@ class BinaryTree {
public void addLeaf(final int node, final int path, final int depth, final int value) {
if (depth == 0) {
// end of the path reached, add the value to the current node
- if (tree[node] == UNDEFINED) {
- tree[node] = value;
- } else {
+ if (tree[node] != UNDEFINED) {
throw new IllegalArgumentException("Tree value at index " + node + " has already been assigned (" + tree[node] + ")");
}
+ tree[node] = value;
} else {
// mark the current node as a non leaf node
tree[node] = NODE;
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
index 636fd35..4cf331c 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ExplodingInputStream.java
@@ -165,7 +165,8 @@ class ExplodingInputStream extends InputStream implements InputStreamStatistics
if (bit == -1) {
// EOF
return;
- } else if (bit == 1) {
+ }
+ if (bit == 1) {
// literal value
final int literal;
if (literalTree != null) {
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java
index 11c904c..685bce9 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/UnshrinkingInputStream.java
@@ -97,24 +97,8 @@ class UnshrinkingInputStream extends LZWInputStream {
final int code = readNextCode();
if (code < 0) {
return -1;
- } else if (code == getClearCode()) {
- final int subCode = readNextCode();
- if (subCode < 0) {
- throw new IOException("Unexpected EOF;");
- } else if (subCode == 1) {
- if (getCodeSize() < MAX_CODE_SIZE) {
- incrementCodeSize();
- } else {
- throw new IOException("Attempt to increase code size beyond maximum");
- }
- } else if (subCode == 2) {
- partialClear();
- setTableSize(getClearCode() + 1);
- } else {
- throw new IOException("Invalid clear code subcode " + subCode);
- }
- return 0;
- } else {
+ }
+ if (code != getClearCode()) {
boolean addedUnfinishedEntry = false;
int effectiveCode = code;
if (!isUsed[code]) {
@@ -123,5 +107,21 @@ class UnshrinkingInputStream extends LZWInputStream {
}
return expandCodeToOutputStack(effectiveCode, addedUnfinishedEntry);
}
+ final int subCode = readNextCode();
+ if (subCode < 0) {
+ throw new IOException("Unexpected EOF;");
+ }
+ if (subCode == 1) {
+ if (getCodeSize() >= MAX_CODE_SIZE) {
+ throw new IOException("Attempt to increase code size beyond maximum");
+ }
+ incrementCodeSize();
+ } else if (subCode == 2) {
+ partialClear();
+ setTableSize(getClearCode() + 1);
+ } else {
+ throw new IOException("Invalid clear code subcode " + subCode);
+ }
+ return 0;
}
}
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
index c2b19d7..c10ca6d 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X7875_NewUnix.java
@@ -324,11 +324,10 @@ public class X7875_NewUnix implements ZipExtraField, Cloneable, Serializable {
int pos = 0;
for (final byte b : array) {
- if (b == 0) {
- pos++;
- } else {
+ if (b != 0) {
break;
}
+ pos++;
}
/*
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index 6774f25..0ffb3ae 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -534,19 +534,23 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
public long getCompressedCount() {
if (current.entry.getMethod() == ZipArchiveOutputStream.STORED) {
return current.bytesRead;
- } else if (current.entry.getMethod() == ZipArchiveOutputStream.DEFLATED) {
+ }
+ if (current.entry.getMethod() == ZipArchiveOutputStream.DEFLATED) {
return getBytesInflated();
- } else if (current.entry.getMethod() == ZipMethod.UNSHRINKING.getCode()) {
+ }
+ if (current.entry.getMethod() == ZipMethod.UNSHRINKING.getCode()) {
return ((UnshrinkingInputStream) current.in).getCompressedCount();
- } else if (current.entry.getMethod() == ZipMethod.IMPLODING.getCode()) {
+ }
+ if (current.entry.getMethod() == ZipMethod.IMPLODING.getCode()) {
return ((ExplodingInputStream) current.in).getCompressedCount();
- } else if (current.entry.getMethod() == ZipMethod.ENHANCED_DEFLATED.getCode()) {
+ }
+ if (current.entry.getMethod() == ZipMethod.ENHANCED_DEFLATED.getCode()) {
return ((Deflate64CompressorInputStream) current.in).getCompressedCount();
- } else if (current.entry.getMethod() == ZipMethod.BZIP2.getCode()) {
+ }
+ if (current.entry.getMethod() == ZipMethod.BZIP2.getCode()) {
return ((BZip2CompressorInputStream) current.in).getCompressedCount();
- } else {
- return -1;
}
+ return -1;
}
/**
@@ -605,11 +609,13 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
if (read <= 0) {
if (inf.finished()) {
return -1;
- } else if (inf.needsDictionary()) {
+ }
+ if (inf.needsDictionary()) {
throw new ZipException("This archive needs a preset dictionary"
+ " which is not supported by Commons"
+ " Compress.");
- } else if (read == -1) {
+ }
+ if (read == -1) {
throw new IOException("Truncated ZIP file");
}
}
@@ -1122,7 +1128,8 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
currentByte = readOneByte();
if (currentByte == -1) {
break;
- } else if (currentByte == ZipArchiveOutputStream.EOCD_SIG[3]) {
+ }
+ if (currentByte == ZipArchiveOutputStream.EOCD_SIG[3]) {
return true;
}
skipReadCall = isFirstByteOfEocdSig(currentByte);
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
index 6ca2d5c..104b396 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
@@ -153,7 +153,8 @@ public abstract class ZipUtil {
static BigInteger longToBig(long l) {
if (l < Integer.MIN_VALUE) {
throw new IllegalArgumentException("Negative longs < -2^31 not permitted: [" + l + "]");
- } else if (l < 0 && l >= Integer.MIN_VALUE) {
+ }
+ if (l < 0 && l >= Integer.MIN_VALUE) {
// If someone passes in a -2, they probably mean 4294967294
// (For example, Unix UID/GID's are 32 bit unsigned.)
l = ZipUtil.adjustToLong((int) l);
diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
index 020876b..ee56a4c 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
@@ -837,28 +837,28 @@ public class BZip2CompressorInputStream extends CompressorInputStream
this.currentState = RAND_PART_A_STATE;
this.su_count = 1;
return setupRandPartA();
- } else if (++this.su_count >= 4) {
- this.su_z = (char) (this.data.ll8[this.su_tPos] & 0xff);
- checkBounds(this.su_tPos, this.data.tt.length, "su_tPos");
- this.su_tPos = this.data.tt[this.su_tPos];
- if (this.su_rNToGo == 0) {
- this.su_rNToGo = Rand.rNums(this.su_rTPos) - 1;
- if (++this.su_rTPos == 512) {
- this.su_rTPos = 0;
- }
- } else {
- this.su_rNToGo--;
- }
- this.su_j2 = 0;
- this.currentState = RAND_PART_C_STATE;
- if (this.su_rNToGo == 1) {
- this.su_z ^= 1;
- }
- return setupRandPartC();
- } else {
+ }
+ if (++this.su_count < 4) {
this.currentState = RAND_PART_A_STATE;
return setupRandPartA();
}
+ this.su_z = (char) (this.data.ll8[this.su_tPos] & 0xff);
+ checkBounds(this.su_tPos, this.data.tt.length, "su_tPos");
+ this.su_tPos = this.data.tt[this.su_tPos];
+ if (this.su_rNToGo == 0) {
+ this.su_rNToGo = Rand.rNums(this.su_rTPos) - 1;
+ if (++this.su_rTPos == 512) {
+ this.su_rTPos = 0;
+ }
+ } else {
+ this.su_rNToGo--;
+ }
+ this.su_j2 = 0;
+ this.currentState = RAND_PART_C_STATE;
+ if (this.su_rNToGo == 1) {
+ this.su_z ^= 1;
+ }
+ return setupRandPartC();
}
private int setupRandPartC() throws IOException {
@@ -877,15 +877,15 @@ public class BZip2CompressorInputStream extends CompressorInputStream
if (this.su_ch2 != this.su_chPrev) {
this.su_count = 1;
return setupNoRandPartA();
- } else if (++this.su_count >= 4) {
+ }
+ if (++this.su_count >= 4) {
checkBounds(this.su_tPos, this.data.ll8.length, "su_tPos");
this.su_z = (char) (this.data.ll8[this.su_tPos] & 0xff);
this.su_tPos = this.data.tt[this.su_tPos];
this.su_j2 = 0;
return setupNoRandPartC();
- } else {
- return setupNoRandPartA();
}
+ return setupNoRandPartA();
}
private int setupNoRandPartC() throws IOException {
diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
index 814e4a0..9321be8 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
@@ -394,11 +394,10 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream
@Override
public void write(final int b) throws IOException {
- if (!closed) {
- write0(b);
- } else {
+ if (closed) {
throw new IOException("Closed");
}
+ write0(b);
}
/**
@@ -1235,11 +1234,10 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream
mtfFreq[RUNB]++;
}
- if (zPend >= 2) {
- zPend = (zPend - 2) >> 1;
- } else {
+ if (zPend < 2) {
break;
}
+ zPend = (zPend - 2) >> 1;
}
zPend = 0;
}
@@ -1262,11 +1260,10 @@ public class BZip2CompressorOutputStream extends CompressorOutputStream
mtfFreq[RUNB]++;
}
- if (zPend >= 2) {
- zPend = (zPend - 2) >> 1;
- } else {
+ if (zPend < 2) {
break;
}
+ zPend = (zPend - 2) >> 1;
}
}
diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
index d0c001b..de32ba6 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BlockSort.java
@@ -666,7 +666,6 @@ class BlockSort {
int x = lastShadow;
X: while (x > 0) {
x -= 4;
-
if (block[i1 + 1] == block[i2 + 1]) {
if (quadrant[i1] == quadrant[i2]) {
if (block[i1 + 2] == block[i2 + 2]) {
@@ -683,46 +682,46 @@ class BlockSort {
}
workDoneShadow++;
continue X;
- } else if ((quadrant[i1 + 3] > quadrant[i2 + 3])) {
+ }
+ if ((quadrant[i1 + 3] > quadrant[i2 + 3])) {
continue HAMMER;
- } else {
- break HAMMER;
}
- } else if ((block[i1 + 4] & 0xff) > (block[i2 + 4] & 0xff)) {
- continue HAMMER;
- } else {
break HAMMER;
}
- } else if ((quadrant[i1 + 2] > quadrant[i2 + 2])) {
- continue HAMMER;
- } else {
+ if ((block[i1 + 4] & 0xff) > (block[i2 + 4] & 0xff)) {
+ continue HAMMER;
+ }
break HAMMER;
}
- } else if ((block[i1 + 3] & 0xff) > (block[i2 + 3] & 0xff)) {
- continue HAMMER;
- } else {
+ if ((quadrant[i1 + 2] > quadrant[i2 + 2])) {
+ continue HAMMER;
+ }
break HAMMER;
}
- } else if ((quadrant[i1 + 1] > quadrant[i2 + 1])) {
- continue HAMMER;
- } else {
+ if ((block[i1 + 3] & 0xff) > (block[i2 + 3] & 0xff)) {
+ continue HAMMER;
+ }
break HAMMER;
}
- } else if ((block[i1 + 2] & 0xff) > (block[i2 + 2] & 0xff)) {
- continue HAMMER;
- } else {
+ if ((quadrant[i1 + 1] > quadrant[i2 + 1])) {
+ continue HAMMER;
+ }
break HAMMER;
}
- } else if ((quadrant[i1] > quadrant[i2])) {
- continue HAMMER;
- } else {
+ if ((block[i1 + 2] & 0xff) > (block[i2 + 2] & 0xff)) {
+ continue HAMMER;
+ }
break HAMMER;
}
- } else if ((block[i1 + 1] & 0xff) > (block[i2 + 1] & 0xff)) {
- continue HAMMER;
- } else {
+ if ((quadrant[i1] > quadrant[i2])) {
+ continue HAMMER;
+ }
break HAMMER;
}
+ if ((block[i1 + 1] & 0xff) > (block[i2 + 1] & 0xff)) {
+ continue HAMMER;
+ }
+ break HAMMER;
}
break HAMMER;
@@ -731,31 +730,31 @@ class BlockSort {
continue HAMMER;
}
break HAMMER;
- } else if ((block[i1 + 5] & 0xff) > (block[i2 + 5] & 0xff)) {
+ }
+ if ((block[i1 + 5] & 0xff) > (block[i2 + 5] & 0xff)) {
continue HAMMER;
- } else {
- break HAMMER;
}
- } else if ((block[i1 + 4] & 0xff) > (block[i2 + 4] & 0xff)) {
- continue HAMMER;
- } else {
break HAMMER;
}
- } else if ((block[i1 + 3] & 0xff) > (block[i2 + 3] & 0xff)) {
- continue HAMMER;
- } else {
+ if ((block[i1 + 4] & 0xff) > (block[i2 + 4] & 0xff)) {
+ continue HAMMER;
+ }
break HAMMER;
}
- } else if ((block[i1 + 2] & 0xff) > (block[i2 + 2] & 0xff)) {
- continue HAMMER;
- } else {
+ if ((block[i1 + 3] & 0xff) > (block[i2 + 3] & 0xff)) {
+ continue HAMMER;
+ }
break HAMMER;
}
- } else if ((block[i1 + 1] & 0xff) > (block[i2 + 1] & 0xff)) {
- continue HAMMER;
- } else {
+ if ((block[i1 + 2] & 0xff) > (block[i2 + 2] & 0xff)) {
+ continue HAMMER;
+ }
break HAMMER;
}
+ if ((block[i1 + 1] & 0xff) > (block[i2 + 1] & 0xff)) {
+ continue HAMMER;
+ }
+ break HAMMER;
} // HAMMER
// end inline mainGTU
@@ -864,13 +863,12 @@ class BlockSort {
}
}
- if (unLo <= unHi) {
- final int temp = fmap[unLo];
- fmap[unLo++] = fmap[unHi];
- fmap[unHi--] = temp;
- } else {
+ if (unLo > unHi) {
break;
}
+ final int temp = fmap[unLo];
+ fmap[unLo++] = fmap[unHi];
+ fmap[unHi--] = temp;
}
if (gtHi < ltLo) {
diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
index 2cf6d93..21a8c70 100644
--- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
@@ -155,7 +155,8 @@ public class GzipCompressorOutputStream extends CompressorOutputStream {
if (deflater.finished()) {
throw new IOException("Cannot write more data, the end of the compressed data stream has been reached");
- } else if (length > 0) {
+ }
+ if (length > 0) {
deflater.setInput(buffer, offset, length);
while (!deflater.needsInput()) {
diff --git a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
index 7b89d21..c937875 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
@@ -294,11 +294,10 @@ public class BlockLZ4CompressorOutputStream extends CompressorOutputStream {
final int size = pairs.size();
for (int i = pairsToKeep; i < size; i++) {
final Pair p = pairs.peekFirst();
- if (p.hasBeenWritten()) {
- pairs.removeFirst();
- } else {
+ if (!p.hasBeenWritten()) {
break;
}
+ pairs.removeFirst();
}
}
@@ -326,11 +325,10 @@ public class BlockLZ4CompressorOutputStream extends CompressorOutputStream {
continue;
}
unwrittenLength -= p.length();
- if (p.canBeWritten(unwrittenLength)) {
- p.writeTo(os);
- } else {
+ if (!p.canBeWritten(unwrittenLength)) {
break;
}
+ p.writeTo(os);
}
}
diff --git a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
index 7f29bec..a2e567f 100644
--- a/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStream.java
@@ -176,7 +176,8 @@ public class FramedSnappyCompressorInputStream extends CompressorInputStream
if (inUncompressedChunk) {
return Math.min(uncompressedBytesRemaining,
inputStream.available());
- } else if (currentCompressedChunk != null) {
+ }
+ if (currentCompressedChunk != null) {
return currentCompressedChunk.available();
}
return 0;
diff --git a/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java
index b7ce16f..80f25e3 100644
--- a/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java
@@ -134,22 +134,22 @@ public class ZCompressorInputStream extends LZWInputStream {
final int code = readNextCode();
if (code < 0) {
return -1;
- } else if (blockMode && code == getClearCode()) {
+ }
+ if (blockMode && code == getClearCode()) {
clearEntries();
reAlignReading();
resetCodeSize();
resetPreviousCode();
return 0;
- } else {
- boolean addedUnfinishedEntry = false;
- if (code == getTableSize()) {
- addRepeatOfPreviousCode();
- addedUnfinishedEntry = true;
- } else if (code > getTableSize()) {
- throw new IOException(String.format("Invalid %d bit code 0x%x", getCodeSize(), code));
- }
- return expandCodeToOutputStack(code, addedUnfinishedEntry);
}
+ boolean addedUnfinishedEntry = false;
+ if (code == getTableSize()) {
+ addRepeatOfPreviousCode();
+ addedUnfinishedEntry = true;
+ } else if (code > getTableSize()) {
+ throw new IOException(String.format("Invalid %d bit code 0x%x", getCodeSize(), code));
+ }
+ return expandCodeToOutputStack(code, addedUnfinishedEntry);
}
/**
diff --git a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java
index 8a0471a..1f04922 100644
--- a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java
+++ b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java
@@ -219,9 +219,8 @@ public final class DetectCompressorTestCase {
if (e.getCause() != null && e.getCause() instanceof Exception) {
//unwrap cause to reveal MemoryLimitException
throw (Exception)e.getCause();
- } else {
- throw e;
}
+ throw e;
}
}