[commons-compress] branch master updated: Replace wrapper Collections.sort is with an instance method directly. (#245)

[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-compress.git


The following commit(s) were added to refs/heads/master by this push:
     new bf98a8c  Replace wrapper Collections.sort is with an instance method 
directly. (#245)
bf98a8c is described below

commit bf98a8cfe5259858981bdc7b45736292966d835a
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Feb 13 16:53:39 2022 +0100

    Replace wrapper Collections.sort is with an instance method directly. (#245)
---
 .../java/org/apache/commons/compress/harmony/pack200/BandSet.java | 4 +---
 .../org/apache/commons/compress/harmony/pack200/ClassBands.java   | 8 ++++----
 .../org/apache/commons/compress/harmony/pack200/PackingUtils.java | 3 +--
 .../org/apache/commons/compress/harmony/unpack200/IcBands.java    | 3 +--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java 
b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
index aae4e69..f77769d 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
@@ -19,7 +19,6 @@ package org.apache.commons.compress.harmony.pack200;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -365,8 +364,7 @@ public abstract class BandSet {
 
         // Sort the favoured list with the most commonly occurring first
         if (distinctValues.size() > 255) {
-            Collections.sort(favoured,
-                (arg0, arg1) -> ((Integer) 
distinctValues.get(arg1)).compareTo((Integer) distinctValues.get(arg0)));
+            favoured.sort((arg0, arg1) -> ((Integer) 
distinctValues.get(arg1)).compareTo((Integer) distinctValues.get(arg0)));
         }
 
         final IntList unfavoured = new IntList();
diff --git 
a/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java 
b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
index f28f327..0cb7699 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
@@ -419,10 +419,10 @@ public class ClassBands extends BandSet {
             final NewAttributeBands bands1 = (NewAttributeBands) arg1;
             return bands0.getFlagIndex() - bands1.getFlagIndex();
         };
-        Collections.sort(classAttributeBands, comparator);
-        Collections.sort(methodAttributeBands, comparator);
-        Collections.sort(fieldAttributeBands, comparator);
-        Collections.sort(codeAttributeBands, comparator);
+        classAttributeBands.sort(comparator);
+        methodAttributeBands.sort(comparator);
+        fieldAttributeBands.sort(comparator);
+        codeAttributeBands.sort(comparator);
 
         for (Object classAttributeBand : classAttributeBands) {
             final NewAttributeBands bands = (NewAttributeBands) 
classAttributeBand;
diff --git 
a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java 
b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
index 7420feb..614b734 100644
--- 
a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
+++ 
b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
@@ -217,7 +216,7 @@ public class PackingUtils {
 
         // Sort files by name, "META-INF/MANIFEST.MF" should be put in the 1st
         // position
-        Collections.sort(packingFileList, (arg0, arg1) -> {
+        packingFileList.sort((arg0, arg1) -> {
             if (arg0 instanceof PackingFile && arg1 instanceof PackingFile) {
                 final String fileName0 = ((PackingFile) arg0).getName();
                 final String fileName1 = ((PackingFile) arg1).getName();
diff --git 
a/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java 
b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java
index fce3ca9..76f43cd 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java
@@ -19,7 +19,6 @@ package org.apache.commons.compress.harmony.unpack200;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -218,7 +217,7 @@ public class IcBands extends BandSet {
         // End not part of the spec. Ugh.
 
         // Now order the result as a subsequence of ic_all
-        Collections.sort(relevantTuples, (arg0, arg1) -> {
+        relevantTuples.sort((arg0, arg1) -> {
             final Integer index1 = Integer.valueOf(((IcTuple) 
arg0).getTupleIndex());
             final Integer index2 = Integer.valueOf(((IcTuple) 
arg1).getTupleIndex());
             return index1.compareTo(index2);