[commons-io] branch master updated: Make some simplifications (#121)

[ggregory]

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-io.git


The following commit(s) were added to refs/heads/master by this push:
     new e9d29f6  Make some simplifications (#121)
e9d29f6 is described below

commit e9d29f607171ab65b95a82ae2ed0ca0117aba66e
Author: Jerome Wolff <34198274+linuxcli...@users.noreply.github.com>
AuthorDate: Mon Jun 22 15:36:02 2020 +0200

    Make some simplifications (#121)
---
 .../org/apache/commons/io/comparator/SizeFileComparator.java |  4 ++--
 src/main/java/org/apache/commons/io/file/PathUtils.java      |  2 +-
 .../org/apache/commons/io/filefilter/FileFilterUtils.java    |  4 ++--
 .../java/org/apache/commons/io/input/BOMInputStream.java     | 12 ++----------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java 
b/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
index edd7998..34944b3 100644
--- a/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
+++ b/src/main/java/org/apache/commons/io/comparator/SizeFileComparator.java
@@ -108,13 +108,13 @@ public class SizeFileComparator extends 
AbstractFileComparator implements Serial
      */
     @Override
     public int compare(final File file1, final File file2) {
-        long size1 = 0;
+        long size1;
         if (file1.isDirectory()) {
             size1 = sumDirectoryContents && file1.exists() ? 
FileUtils.sizeOfDirectory(file1) : 0;
         } else {
             size1 = file1.length();
         }
-        long size2 = 0;
+        long size2;
         if (file2.isDirectory()) {
             size2 = sumDirectoryContents && file2.exists() ? 
FileUtils.sizeOfDirectory(file2) : 0;
         } else {
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java 
b/src/main/java/org/apache/commons/io/file/PathUtils.java
index 75ca109..718e131 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -500,7 +500,7 @@ public final class PathUtils {
      */
     static List<Path> relativize(Collection<Path> collection, Path parent, 
boolean sort,
             Comparator<? super Path> comparator) {
-        Stream<Path> stream = collection.stream().map(e -> 
parent.relativize(e));
+        Stream<Path> stream = collection.stream().map(parent::relativize);
         if (sort) {
             stream = comparator == null ? stream.sorted() : 
stream.sorted(comparator);
         }
diff --git 
a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java 
b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
index b94c537..9ff77ac 100644
--- a/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
+++ b/src/main/java/org/apache/commons/io/filefilter/FileFilterUtils.java
@@ -150,7 +150,7 @@ public class FileFilterUtils {
      * @since 2.0
      */
     public static List<File> filterList(final IOFileFilter filter, final 
Iterable<File> files) {
-        return filter(filter, files, new ArrayList<File>());
+        return filter(filter, files, new ArrayList<>());
     }
 
     /**
@@ -241,7 +241,7 @@ public class FileFilterUtils {
      * @since 2.0
      */
     public static Set<File> filterSet(final IOFileFilter filter, final 
Iterable<File> files) {
-        return filter(filter, files, new HashSet<File>());
+        return filter(filter, files, new HashSet<>());
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/io/input/BOMInputStream.java 
b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
index 6bb7694..383aa35 100644
--- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
@@ -21,10 +21,8 @@ import static org.apache.commons.io.IOUtils.EOF;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-
 import org.apache.commons.io.ByteOrderMark;
 import org.apache.commons.io.IOUtils;
 
@@ -140,13 +138,7 @@ public class BOMInputStream extends ProxyInputStream {
     private static final Comparator<ByteOrderMark> 
ByteOrderMarkLengthComparator = (bom1, bom2) -> {
         final int len1 = bom1.length();
         final int len2 = bom2.length();
-        if (len1 > len2) {
-            return EOF;
-        }
-        if (len2 > len1) {
-            return 1;
-        }
-        return 0;
+        return Integer.compare(len2, len1);
     };
 
     /**
@@ -167,7 +159,7 @@ public class BOMInputStream extends ProxyInputStream {
         this.include = include;
         final List<ByteOrderMark> list = Arrays.asList(boms);
         // Sort the BOMs to match the longest BOM first because some BOMs have 
the same starting two bytes.
-        Collections.sort(list, ByteOrderMarkLengthComparator);
+        list.sort(ByteOrderMarkLengthComparator);
         this.boms = list;
 
     }