You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2018/01/18 13:24:07 UTC
[07/12] commons-compress git commit: if statement can be simplified.
if statement can be simplified.
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/f21a7054
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/f21a7054
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/f21a7054
Branch: refs/heads/master
Commit: f21a7054086522e3d34b569d8d05d5caa6297f69
Parents: 0194bb8
Author: shahab <sh...@gmail.com>
Authored: Sun Jan 14 14:19:10 2018 -0500
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Jan 18 14:20:49 2018 +0100
----------------------------------------------------------------------
.../compress/archivers/ar/ArArchiveEntry.java | 9 ++-------
.../archivers/cpio/CpioArchiveEntry.java | 9 ++-------
.../archivers/dump/DumpArchiveEntry.java | 8 ++------
.../archivers/dump/DumpArchiveUtil.java | 6 +-----
.../compress/archivers/tar/TarArchiveEntry.java | 6 +-----
.../archivers/tar/TarArchiveInputStream.java | 12 ++++-------
.../bzip2/BZip2CompressorInputStream.java | 20 ++-----------------
.../gzip/GzipCompressorInputStream.java | 15 +-------------
.../lzma/LZMACompressorInputStream.java | 21 +++-----------------
9 files changed, 18 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
index d1ce649..b53347e 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
@@ -179,12 +179,7 @@ public class ArArchiveEntry implements ArchiveEntry {
}
final ArArchiveEntry other = (ArArchiveEntry) obj;
if (name == null) {
- if (other.name != null) {
- return false;
- }
- } else if (!name.equals(other.name)) {
- return false;
- }
- return true;
+ return other.name == null;
+ } else return name.equals(other.name);
}
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
index cb48ef4..f27040b 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
@@ -886,12 +886,7 @@ public class CpioArchiveEntry implements CpioConstants, ArchiveEntry {
}
final CpioArchiveEntry other = (CpioArchiveEntry) obj;
if (name == null) {
- if (other.name != null) {
- return false;
- }
- } else if (!name.equals(other.name)) {
- return false;
- }
- return true;
+ return other.name == null;
+ } else return name.equals(other.name);
}
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveEntry.java
----------------------------------------------------------------------
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 34c4a88..656ab7d 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
@@ -418,12 +418,8 @@ public class DumpArchiveEntry implements ArchiveEntry {
}
// summary is always null right now, but this may change some day
- if ((summary == null && rhs.summary != null) // NOSONAR
- || (summary != null && !summary.equals(rhs.summary))) { // NOSONAR
- return false;
- }
-
- return true;
+ return (summary != null || rhs.summary == null) // NOSONAR
+ && (summary == null || summary.equals(rhs.summary));
}
@Override
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
index f971538..20e1eb3 100644
--- a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
+++ b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveUtil.java
@@ -66,11 +66,7 @@ class DumpArchiveUtil {
//verify checksum...
final int checksum = convert32(buffer, 28);
- if (checksum != calculateChecksum(buffer)) {
- return false;
- }
-
- return true;
+ return checksum == calculateChecksum(buffer);
}
/**
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
index 312b0a3..76f48e9 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java
@@ -864,11 +864,7 @@ public class TarArchiveEntry implements ArchiveEntry, TarConstants {
return true;
}
- if (!isPaxHeader() && !isGlobalPaxHeader() && getName().endsWith("/")) {
- return true;
- }
-
- return false;
+ return !isPaxHeader() && !isGlobalPaxHeader() && getName().endsWith("/");
}
/**
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
index 71c943d..3dbaa09 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
@@ -704,15 +704,11 @@ public class TarArchiveInputStream extends ArchiveInputStream {
return true;
}
// COMPRESS-107 - recognise Ant tar files
- if (ArchiveUtils.matchAsciiBuffer(TarConstants.MAGIC_ANT,
+ return ArchiveUtils.matchAsciiBuffer(TarConstants.MAGIC_ANT,
signature, TarConstants.MAGIC_OFFSET, TarConstants.MAGICLEN)
- &&
- ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_ANT,
- signature, TarConstants.VERSION_OFFSET, TarConstants.VERSIONLEN)
- ){
- return true;
- }
- return false;
+ &&
+ ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_ANT,
+ signature, TarConstants.VERSION_OFFSET, TarConstants.VERSIONLEN);
}
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
----------------------------------------------------------------------
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 945ba3c..f053420 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
@@ -954,23 +954,7 @@ public class BZip2CompressorInputStream extends CompressorInputStream implements
* @since 1.1
*/
public static boolean matches(final byte[] signature, final int length) {
-
- if (length < 3) {
- return false;
- }
-
- if (signature[0] != 'B') {
- return false;
- }
-
- if (signature[1] != 'Z') {
- return false;
- }
-
- if (signature[2] != 'h') {
- return false;
- }
-
- return true;
+ return length >= 3 && signature[0] == 'B' &&
+ signature[1] == 'Z' && signature[2] == 'h';
}
}
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
index 7f5bc6a..e939a17 100644
--- a/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
@@ -345,20 +345,7 @@ public class GzipCompressorInputStream extends CompressorInputStream {
* @since 1.1
*/
public static boolean matches(final byte[] signature, final int length) {
-
- if (length < 2) {
- return false;
- }
-
- if (signature[0] != 31) {
- return false;
- }
-
- if (signature[1] != -117) {
- return false;
- }
-
- return true;
+ return length >= 2 && signature[0] == 31 && signature[1] == -117;
}
/**
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/f21a7054/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
index b7c65f1..5f01d77 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
@@ -123,23 +123,8 @@ public class LZMACompressorInputStream extends CompressorInputStream {
* @since 1.10
*/
public static boolean matches(final byte[] signature, final int length) {
-
- if (signature == null || length < 3) {
- return false;
- }
-
- if (signature[0] != 0x5d) {
- return false;
- }
-
- if (signature[1] != 0) {
- return false;
- }
-
- if (signature[2] != 0) {
- return false;
- }
-
- return true;
+ return signature != null && length >= 3 &&
+ signature[0] == 0x5d && signature[1] == 0 &&
+ signature[2] == 0;
}
}