Merge pull request #178 from arturobernalg/feature/lambda

Minor Improvements
apache · Mar 26, 2021 · 2ea18b8 · 2ea18b8
2 parents a669dfb + af92156
commit 2ea18b8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 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
@@ -327,10 +327,6 @@ public boolean equals(final Object o) {
             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
@@ -301,7 +301,7 @@ public void expand(final ZipFile archive, final File targetDirectory)
      */
     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
@@ -570,9 +570,6 @@ private boolean equalSevenZMethods(final Iterable<? extends SevenZMethodConfigur
                 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
@@ -340,13 +340,10 @@ private void buildSparseInputStreams() throws IOException {
         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
@@ -1277,11 +1277,7 @@ private void fillNameMap() {
             // 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);
         }
     }