[commons-compress] branch master updated: * Use lambda and method reference * Simplify conditions

[bodewig]

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git


The following commit(s) were added to refs/heads/master by this push:
     new af92156  * Use lambda and method reference * Simplify conditions
     new 2ea18b8  Merge pull request #178 from arturobernalg/feature/lambda
af92156 is described below

commit af921560e30e688342f8441994e780d02d99e683
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Thu Mar 25 17:50:39 2021 +0100

    * Use lambda and method reference
    * Simplify conditions
---
 .../commons/compress/archivers/dump/DumpArchiveSummary.java   |  6 +-----
 .../apache/commons/compress/archivers/examples/Expander.java  |  2 +-
 .../commons/compress/archivers/sevenz/SevenZArchiveEntry.java |  5 +----
 .../org/apache/commons/compress/archivers/tar/TarFile.java    | 11 ++++-------
 .../org/apache/commons/compress/archivers/zip/ZipFile.java    |  6 +-----
 5 files changed, 8 insertions(+), 22 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveSummary.java
 
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveSummary.java
index 47db7ff..08c0943 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveSummary.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/dump/DumpArchiveSummary.java
@@ -327,10 +327,6 @@ public class DumpArchiveSummary {
             return false;
         }
 
-        if ((getDevname() == null) || !getDevname().equals(rhs.getDevname())) {
-            return false;
-        }
-
-        return true;
+        return (getDevname() != null) && getDevname().equals(rhs.getDevname());
     }
 }
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java 
b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
index 803381d..1902a8b 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
@@ -301,7 +301,7 @@ public class Expander {
      */
     public void expand(final SevenZFile archive, final File targetDirectory)
         throws IOException, ArchiveException {
-        expand(() -> archive.getNextEntry(), (entry, out) -> {
+        expand(archive::getNextEntry, (entry, out) -> {
             final byte[] buffer = new byte[8024];
             int n;
             while (-1 != (n = archive.read(buffer))) {
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
 
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
index a899329..7c2b814 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZArchiveEntry.java
@@ -570,9 +570,6 @@ public class SevenZArchiveEntry implements ArchiveEntry {
                 return false;
             }
         }
-        if (i2.hasNext()) {
-            return false;
-        }
-        return true;
+        return !i2.hasNext();
     }
 }
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java 
b/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
index a5e8b06..6d4a4a8 100644
--- a/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/tar/TarFile.java
@@ -340,13 +340,10 @@ public class TarFile implements Closeable {
         final List<TarArchiveStructSparse> sparseHeaders = 
currEntry.getSparseHeaders();
         // sort the sparse headers in case they are written in wrong order
         if (sparseHeaders != null && sparseHeaders.size() > 1) {
-            final Comparator<TarArchiveStructSparse> sparseHeaderComparator = 
new Comparator<TarArchiveStructSparse>() {
-                @Override
-                public int compare(final TarArchiveStructSparse p, final 
TarArchiveStructSparse q) {
-                    Long pOffset = p.getOffset();
-                    Long qOffset = q.getOffset();
-                    return pOffset.compareTo(qOffset);
-                }
+            final Comparator<TarArchiveStructSparse> sparseHeaderComparator = 
(p, q) -> {
+                Long pOffset = p.getOffset();
+                Long qOffset = q.getOffset();
+                return pOffset.compareTo(qOffset);
             };
             Collections.sort(sparseHeaders, sparseHeaderComparator);
         }
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index 9adb8b1..d3dd565 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -1277,11 +1277,7 @@ public class ZipFile implements Closeable {
             // entries is filled in populateFromCentralDirectory and
             // never modified
             final String name = ze.getName();
-            LinkedList<ZipArchiveEntry> entriesOfThatName = nameMap.get(name);
-            if (entriesOfThatName == null) {
-                entriesOfThatName = new LinkedList<>();
-                nameMap.put(name, entriesOfThatName);
-            }
+            LinkedList<ZipArchiveEntry> entriesOfThatName = 
nameMap.computeIfAbsent(name, k -> new LinkedList<>());
             entriesOfThatName.addLast(ze);
         }
     }