You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/10/14 20:07:32 UTC
[solr] branch main updated: SOLR-16318: replace 'Collections.sort(List, Comparator)' use (#1016)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 69887867379 SOLR-16318: replace 'Collections.sort(List, Comparator)' use (#1016)
69887867379 is described below
commit 69887867379457e2031f384612b1adb952fe5122
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Oct 14 21:07:27 2022 +0100
SOLR-16318: replace 'Collections.sort(List, Comparator)' use (#1016)
Co-authored-by: Kevin Risden <kr...@apache.org>
---
gradle/validation/forbidden-apis/defaults.all.txt | 3 ++
.../apache/solr/cloud/api/collections/Assign.java | 3 +-
.../org/apache/solr/core/DirectoryFactory.java | 2 +-
.../solr/handler/admin/ZookeeperInfoHandler.java | 3 +-
.../handler/component/MoreLikeThisComponent.java | 3 +-
.../component/PivotFacetFieldValueCollection.java | 4 +-
.../handler/component/RealTimeGetComponent.java | 2 +-
.../solr/highlight/DefaultSolrHighlighter.java | 2 +-
.../java/org/apache/solr/schema/IndexSchema.java | 3 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 2 +-
.../search/facet/FacetRequestSortedMerger.java | 6 +--
.../apache/solr/spelling/PossibilityIterator.java | 3 +-
.../DocExpirationUpdateProcessorFactory.java | 2 +-
.../update/processor/TextProfileSignature.java | 3 +-
.../test/org/apache/solr/TestGroupingSearch.java | 6 +--
solr/core/src/test/org/apache/solr/TestJoin.java | 3 +-
.../test/org/apache/solr/core/CoreSorterTest.java | 2 +-
.../solr/handler/admin/DaemonStreamApiTest.java | 3 +-
.../component/DistributedFacetPivotSmallTest.java | 9 ++---
.../solr/response/TestRetrieveFieldsOptimizer.java | 6 +--
.../apache/solr/search/RankQueryTestPlugin.java | 13 ++----
.../src/test/org/apache/solr/search/TestSort.java | 4 +-
.../apache/solr/search/facet/TestJsonFacets.java | 3 +-
.../solr/search/join/TestScoreJoinQPNoScore.java | 3 +-
.../solr/uninverting/TestFieldCacheSortRandom.java | 3 +-
.../apache/solr/analytics/facet/SortableFacet.java | 3 +-
.../org/apache/solr/hdfs/HdfsDirectoryFactory.java | 2 +-
.../client/solrj/io/eval/PairSortEvaluator.java | 3 +-
.../solr/client/solrj/io/stream/FacetStream.java | 3 +-
.../solrj/io/stream/SignificantTermsStream.java | 3 +-
.../client/solrj/io/graph/GraphExpressionTest.java | 46 +++++++++++-----------
.../solrj/io/stream/StreamDecoratorTest.java | 9 ++---
.../solrj/io/stream/StreamExpressionTest.java | 9 ++---
.../src/java/org/apache/solr/SolrTestCaseHS.java | 3 +-
34 files changed, 76 insertions(+), 101 deletions(-)
diff --git a/gradle/validation/forbidden-apis/defaults.all.txt b/gradle/validation/forbidden-apis/defaults.all.txt
index 298603164af..a7647ddbcb7 100644
--- a/gradle/validation/forbidden-apis/defaults.all.txt
+++ b/gradle/validation/forbidden-apis/defaults.all.txt
@@ -80,3 +80,6 @@ java.lang.System#currentTimeMillis()
@defaultMessage Use slf4j classes instead
java.util.logging.**
+
+@defaultMessage Use List.sort(Comparator) instead of Collections.sort(List, Comparator) please.
+java.util.Collections#sort(java.util.List, java.util.Comparator)
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
index e8c01a2829b..3d9d849c40a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
@@ -178,8 +178,7 @@ public class Assign {
map.put(shardId, cnt);
}
- Collections.sort(
- shardIdNames,
+ shardIdNames.sort(
(String o1, String o2) -> {
Integer one = map.get(o1);
Integer two = map.get(o2);
diff --git a/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java
index e2a9df61741..baa4bc9fcac 100644
--- a/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java
@@ -365,7 +365,7 @@ public abstract class DirectoryFactory implements NamedListInitializedPlugin, Cl
return; // nothing to do (no log message needed)
List<File> dirsList = Arrays.asList(oldIndexDirs);
- Collections.sort(dirsList, Collections.reverseOrder());
+ dirsList.sort(Collections.reverseOrder());
int i = 0;
if (afterCoreReload) {
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
index 3191b83ba82..b2ecf0b5696 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java
@@ -29,7 +29,6 @@ import java.lang.invoke.MethodHandles;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
@@ -287,7 +286,7 @@ public final class ZookeeperInfoHandler extends RequestHandlerBase {
if (fromZk != null) cachedCollections.addAll(fromZk);
// sort the final merged set of collections
- Collections.sort(cachedCollections, this);
+ cachedCollections.sort(this);
}
return cachedCollections;
diff --git a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
index cff0f6138b1..608ca319470 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
@@ -21,7 +21,6 @@ import static org.apache.solr.common.params.CommonParams.SORT;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -292,7 +291,7 @@ public class MoreLikeThisComponent extends SearchComponent {
}
};
- Collections.sort(l, c);
+ l.sort(c);
// Truncate list to maxSize
if (l.size() > maxSize) {
diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java
index 104f82c78bf..bc2495d78c8 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java
@@ -258,9 +258,9 @@ public class PivotFacetFieldValueCollection implements Iterable<PivotFacetValue>
if (dirty) {
if (facetFieldSort.equals(FacetParams.FACET_SORT_COUNT)) {
- Collections.sort(this.explicitValues, new PivotFacetCountComparator());
+ this.explicitValues.sort(new PivotFacetCountComparator());
} else if (facetFieldSort.equals(FacetParams.FACET_SORT_INDEX)) {
- Collections.sort(this.explicitValues, new PivotFacetValueComparator());
+ this.explicitValues.sort(new PivotFacetValueComparator());
}
dirty = false;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index 070e0166b20..5da64036fd6 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -1372,7 +1372,7 @@ public class RealTimeGetComponent extends SearchComponent {
versionAvailable = recentUpdates.getVersions(ulog.getNumRecordsToKeep());
}
// sort versions
- Collections.sort(versionAvailable, PeerSync.absComparator);
+ versionAvailable.sort(PeerSync.absComparator);
// This can be done with single pass over both ranges and versionsAvailable, that would require
// merging ranges. We currently use Set to ensure there are no duplicates.
diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
index 24974d2541a..809315e57b5 100644
--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
@@ -783,7 +783,7 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf
if (frags.size() > 0) {
// sort such that the fragments with the highest score come first
if (!preserveMulti) {
- Collections.sort(frags, (arg0, arg1) -> Float.compare(arg1.getScore(), arg0.getScore()));
+ frags.sort((arg0, arg1) -> Float.compare(arg1.getScore(), arg0.getScore()));
}
// Truncate list to hl.snippets, but not when hl.preserveMulti
diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
index 031ea364783..01c2a393b14 100644
--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
@@ -1707,8 +1707,7 @@ public class IndexSchema {
SortedMap<String, List<CopyField>> sortedCopyFields = new TreeMap<>(copyFieldsMap);
for (List<CopyField> copyFields : sortedCopyFields.values()) {
copyFields = new ArrayList<>(copyFields);
- Collections.sort(
- copyFields,
+ copyFields.sort(
(cf1, cf2) -> {
// sources are all the same, just sorting by destination here
return cf1.getDestination().getName().compareTo(cf2.getDestination().getName());
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 219384d4ea6..ca084cc75c6 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -1261,7 +1261,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
// Set pf.postFilter
if (postFilters != null) {
- Collections.sort(postFilters, sortByCost);
+ postFilters.sort(sortByCost);
for (int i = postFilters.size() - 1; i >= 0; i--) {
DelegatingCollector prev = pf.postFilter;
pf.postFilter = postFilters.get(i).getFilterCollector(this);
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
index 0b7eecfcd47..bb7af635fef 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
@@ -101,10 +101,10 @@ abstract class FacetRequestSortedMerger<FacetRequestT extends FacetRequestSorted
int v = -Long.compare(o1.count, o2.count) * sortMul;
return v == 0 ? o1.bucketValue.compareTo(o2.bucketValue) : v;
};
- Collections.sort(sortedBuckets, comparator);
+ sortedBuckets.sort(comparator);
} else if ("index".equals(sort.sortVariable)) {
comparator = (o1, o2) -> -o1.bucketValue.compareTo(o2.bucketValue) * sortMul;
- Collections.sort(sortedBuckets, comparator);
+ sortedBuckets.sort(comparator);
} else {
final String key = sort.sortVariable;
@@ -136,7 +136,7 @@ abstract class FacetRequestSortedMerger<FacetRequestT extends FacetRequestSorted
}
}
Collections.sort(lst);
- Collections.sort(nulls, (o1, o2) -> o1.bucketValue.compareTo(o2.bucketValue));
+ nulls.sort((o1, o2) -> o1.bucketValue.compareTo(o2.bucketValue));
ArrayList<FacetBucket> out = new ArrayList<>(buckets.size());
for (SortVal sv : lst) {
diff --git a/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
index fdf7db38743..e74189bf9a1 100644
--- a/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
+++ b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
@@ -18,7 +18,6 @@ package org.apache.solr.spelling;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
@@ -112,7 +111,7 @@ public class PossibilityIterator implements Iterator<PossibilityIterator.RankedS
} else {
// Needs to be in token-offset order so that the match-and-replace
// option for collations can work.
- Collections.sort(rsp.corrections, new StartOffsetComparator());
+ rsp.corrections.sort(new StartOffsetComparator());
if (removeDuplicates.add(rsp)) {
rankedPossibilities.offer(rsp);
}
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
index 454a1c84d5a..6a8ca31f856 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
@@ -461,7 +461,7 @@ public final class DocExpirationUpdateProcessorFactory extends UpdateRequestProc
return false;
}
List<Slice> slices = new ArrayList<>(Arrays.asList(docCollection.getActiveSlicesArr()));
- Collections.sort(slices, COMPARE_SLICES_BY_NAME);
+ slices.sort(COMPARE_SLICES_BY_NAME);
Replica firstSliceLeader = slices.get(0).getLeader();
if (null == firstSliceLeader) {
log.warn("Slice in charge of periodic deletes for {} does not currently have a leader", col);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java b/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java
index f83df91aaec..21ef1fe5c64 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java
@@ -17,7 +17,6 @@
package org.apache.solr.update.processor;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -122,7 +121,7 @@ public class TextProfileSignature extends MD5Signature {
}
profile.add(t);
}
- Collections.sort(profile, new TokenComparator());
+ profile.sort(new TokenComparator());
StringBuilder newText = new StringBuilder();
it = profile.iterator();
while (it.hasNext()) {
diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
index 9c54fbca86d..013bd2e5ff9 100644
--- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
@@ -22,7 +22,6 @@ import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -1708,7 +1707,7 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {
// first sort the docs in each group
for (Grp grp : groups.values()) {
- Collections.sort(grp.docs, groupComparator);
+ grp.docs.sort(groupComparator);
}
// now sort the groups
@@ -1719,8 +1718,7 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {
}
List<Grp> sortedGroups = new ArrayList<>(groups.values());
- Collections.sort(
- sortedGroups,
+ sortedGroups.sort(
groupComparator == sortComparator
? createFirstDocComparator(sortComparator)
: createMaxDocComparator(sortComparator));
diff --git a/solr/core/src/test/org/apache/solr/TestJoin.java b/solr/core/src/test/org/apache/solr/TestJoin.java
index 9f8b78cc60d..c257f077918 100644
--- a/solr/core/src/test/org/apache/solr/TestJoin.java
+++ b/solr/core/src/test/org/apache/solr/TestJoin.java
@@ -19,7 +19,6 @@ package org.apache.solr;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -374,7 +373,7 @@ public class TestJoin extends SolrTestCaseJ4 {
Set<Comparable> docs = join(fromDocs, pivot);
List<Doc> docList = new ArrayList<>(docs.size());
for (@SuppressWarnings({"rawtypes"}) Comparable id : docs) docList.add(model.get(id));
- Collections.sort(docList, createComparator("_docid_", true, false, false, false));
+ docList.sort(createComparator("_docid_", true, false, false, false));
List<Object> sortedDocs = new ArrayList<>();
for (Doc doc : docList) {
if (sortedDocs.size() >= 10) break;
diff --git a/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java b/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
index ad54a09fbc5..9ca486a2b13 100644
--- a/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
+++ b/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
@@ -75,7 +75,7 @@ public class CoreSorterTest extends SolrTestCaseJ4 {
for (int i = 0; i < 10; i++) {
List<CountsForEachShard> copy = new ArrayList<>(inputCounts);
Collections.shuffle(copy, random());
- Collections.sort(copy, CoreSorter.countsComparator);
+ copy.sort(CoreSorter.countsComparator);
for (int j = 0; j < copy.size(); j++) {
assertEquals(expectedCounts.get(j), copy.get(j));
}
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
index e8c2e6ab274..e5d2d09b663 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
@@ -20,7 +20,6 @@ package org.apache.solr.handler.admin;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.solr.SolrTestCaseJ4;
@@ -318,7 +317,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
}
}
tupleStream.close();
- Collections.sort(tuples, (o1, o2) -> (o1.getString("id").compareTo(o2.getString("id"))));
+ tuples.sort((o1, o2) -> (o1.getString("id").compareTo(o2.getString("id"))));
return tuples;
}
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
index ed9faa912fd..49bc11090cc 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.handler.component;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.LinkedHashMap;
@@ -2432,16 +2431,16 @@ public class DistributedFacetPivotSmallTest extends BaseDistributedSearchTestCas
// Useful to check for errors, orders lists and does toString() equality check
private void testOrderedPivotsStringEquality(
List<PivotField> expectedPlacePivots, List<PivotField> placePivots) {
- Collections.sort(expectedPlacePivots, new PivotFieldComparator());
+ expectedPlacePivots.sort(new PivotFieldComparator());
for (PivotField expectedPivot : expectedPlacePivots) {
if (expectedPivot.getPivot() != null) {
- Collections.sort(expectedPivot.getPivot(), new PivotFieldComparator());
+ expectedPivot.getPivot().sort(new PivotFieldComparator());
}
}
- Collections.sort(placePivots, new PivotFieldComparator());
+ placePivots.sort(new PivotFieldComparator());
for (PivotField pivot : placePivots) {
if (pivot.getPivot() != null) {
- Collections.sort(pivot.getPivot(), new PivotFieldComparator());
+ pivot.getPivot().sort(new PivotFieldComparator());
}
}
assertEquals(expectedPlacePivots.toString(), placePivots.toString());
diff --git a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
index f03ad760256..f0a2b2e2f5f 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java
@@ -655,18 +655,18 @@ class RetrieveField {
switch (testFieldType.getSolrTypeClass()) {
case "solr.TrieIntField":
case "solr.TrieLongField":
- Collections.sort(valsAsStrings, Comparator.comparingInt(Integer::parseInt));
+ valsAsStrings.sort(Comparator.comparingInt(Integer::parseInt));
break;
case "solr.IntPointField":
case "solr.LongPointField":
- Collections.sort(valsAsStrings, Comparator.comparingLong(Long::parseLong));
+ valsAsStrings.sort(Comparator.comparingLong(Long::parseLong));
break;
case "solr.TrieFloatField":
case "solr.FloatPointField":
case "solr.TrieDoubleField":
case "solr.DoublePointField":
- Collections.sort(valsAsStrings, Comparator.comparingDouble(Double::parseDouble));
+ valsAsStrings.sort(Comparator.comparingDouble(Double::parseDouble));
break;
case "solr.TrieDateField":
diff --git a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
index 6ea1e0d899c..fa0def076d5 100644
--- a/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/RankQueryTestPlugin.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
@@ -279,8 +278,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
} // end for-each-doc-in-response
} // end for-each-response
- Collections.sort(
- shardDocs,
+ shardDocs.sort(
(o1, o2) -> {
if (o1.score < o2.score) {
return 1;
@@ -601,8 +599,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
} // end for-each-doc-in-response
} // end for-each-response
- Collections.sort(
- shardDocs,
+ shardDocs.sort(
(o1, o2) -> {
if (o1.score < o2.score) {
return 1;
@@ -723,8 +720,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
}
public TopDocs topDocs() {
- Collections.sort(
- list,
+ list.sort(
new Comparator<>() {
public int compare(ScoreDoc s1, ScoreDoc s2) {
if (s1.score == s2.score) {
@@ -785,8 +781,7 @@ public class RankQueryTestPlugin extends QParserPlugin {
}
public TopDocs topDocs() {
- Collections.sort(
- list,
+ list.sort(
new Comparator<>() {
public int compare(ScoreDoc s1, ScoreDoc s2) {
if (s1.score == s2.score) {
diff --git a/solr/core/src/test/org/apache/solr/search/TestSort.java b/solr/core/src/test/org/apache/solr/search/TestSort.java
index 30402b1ce62..2fc26a5b69f 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSort.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSort.java
@@ -19,7 +19,6 @@ package org.apache.solr.search;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -344,8 +343,7 @@ public class TestSort extends SolrTestCaseJ4 {
searcher.search(query, myCollector);
- Collections.sort(
- collectedDocs,
+ collectedDocs.sort(
(o1, o2) -> {
String v1 = o1.val == null ? nullRep : o1.val;
String v2 = o2.val == null ? nullRep : o2.val;
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
index ece21dea4a9..b82414893f9 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
@@ -218,8 +218,7 @@ public class TestJsonFacets extends SolrTestCaseHS {
for (int i = 0; i < honda_model_counts.length - 1; i++) {
idx.add(i);
}
- Collections.sort(
- idx,
+ idx.sort(
(o1, o2) -> {
int cmp = honda_model_counts[o2] - honda_model_counts[o1];
return cmp == 0 ? o1 - o2 : cmp;
diff --git a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
index 205d1c490d1..61201956565 100644
--- a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
+++ b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -321,7 +320,7 @@ public class TestScoreJoinQPNoScore extends SolrTestCaseJ4 {
Set<Comparable> docs = join(fromDocs, pivot);
List<Doc> docList = new ArrayList<Doc>(docs.size());
for (Comparable id : docs) docList.add(model.get(id));
- Collections.sort(docList, createComparator("_docid_", true, false, false, false));
+ docList.sort(createComparator("_docid_", true, false, false, false));
List sortedDocs = new ArrayList();
for (Doc doc : docList) {
if (sortedDocs.size() >= 10) break;
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java
index 17a8b1592a7..4a27ebb5b46 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java
@@ -196,8 +196,7 @@ public class TestFieldCacheSortRandom extends SolrTestCase {
}
// Compute expected results:
- Collections.sort(
- f.matchValues,
+ f.matchValues.sort(
new Comparator<BytesRef>() {
@Override
public int compare(BytesRef a, BytesRef b) {
diff --git a/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java
index e0a4087dc95..86e906705e3 100644
--- a/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java
+++ b/solr/modules/analytics/src/java/org/apache/solr/analytics/facet/SortableFacet.java
@@ -18,7 +18,6 @@ package org.apache.solr.analytics.facet;
import com.google.common.collect.Iterables;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedList;
@@ -82,7 +81,7 @@ public abstract class SortableFacet extends AnalyticsFacet {
return facetResults;
}
Comparator<FacetBucket> comp = sort.getComparator();
- Collections.sort(facetResults, comp);
+ facetResults.sort(comp);
Iterable<FacetBucket> facetResultsIter = facetResults;
// apply the limit
diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java
index 0454a113d56..9ad61417706 100644
--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java
+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/HdfsDirectoryFactory.java
@@ -656,7 +656,7 @@ public class HdfsDirectoryFactory extends CachingDirectoryFactory
oldIndexPaths.add(ofs.getPath());
}
- Collections.sort(oldIndexPaths, Collections.reverseOrder());
+ oldIndexPaths.sort(Collections.reverseOrder());
Set<String> livePaths = getLivePaths();
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PairSortEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PairSortEvaluator.java
index d7e928d7a17..907420ef4f0 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PairSortEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PairSortEvaluator.java
@@ -18,7 +18,6 @@ package org.apache.solr.client.solrj.io.eval;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
@@ -88,7 +87,7 @@ public class PairSortEvaluator extends RecursiveNumericEvaluator implements TwoV
pairs.add(pair);
}
- Collections.sort(pairs, new PairComp());
+ pairs.sort(new PairComp());
double[][] data = new double[2][pairs.size()];
for (int i = 0; i < pairs.size(); i++) {
data[0][i] = pairs.get(i)[0];
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
index 9a702894fb8..c09a97d1af8 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
@@ -19,7 +19,6 @@ package org.apache.solr.client.solrj.io.stream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -703,7 +702,7 @@ public class FacetStream extends TupleStream implements Expressible, ParallelMet
getTuples(response, buckets, metrics);
if (resortNeeded) {
- Collections.sort(tuples, getStreamSort());
+ tuples.sort(getStreamSort());
}
index = this.offset;
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
index 31bcc69a9c3..a7aa7c836a4 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
@@ -21,7 +21,6 @@ import static org.apache.solr.common.params.CommonParams.DISTRIB;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -356,7 +355,7 @@ public class SignificantTermsStream extends TupleStream implements Expressible {
maps.add(map);
}
- Collections.sort(maps, new ScoreComp());
+ maps.sort(new ScoreComp());
List<Tuple> tuples = new ArrayList<>();
for (Map<String, Object> map : maps) {
if (tuples.size() == numTerms) break;
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
index 5291964db9c..ee8597f5f38 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphExpressionTest.java
@@ -440,7 +440,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 4);
assertTrue(tuples.get(0).getString("node").equals("basket1"));
@@ -459,7 +459,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 1);
assertTrue(tuples.get(0).getString("node").equals("basket2"));
@@ -479,7 +479,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 5);
@@ -512,7 +512,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
context.setSolrClientCache(cache);
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 3);
assertTrue(tuples.get(0).getString("node").equals("basket2"));
assertTrue(tuples.get(1).getString("node").equals("basket3"));
@@ -532,7 +532,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 2);
assertTrue(tuples.get(0).getString("node").equals("basket2"));
assertTrue(tuples.get(1).getString("node").equals("basket3"));
@@ -549,7 +549,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 4);
assertTrue(tuples.get(0).getString("node").equals("1"));
assertTrue(tuples.get(1).getString("node").equals("2"));
@@ -566,7 +566,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 3);
assertTrue(tuples.get(0).getString("node").equals("4"));
assertTrue(tuples.get(1).getString("node").equals("5"));
@@ -582,7 +582,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 3);
assertTrue(tuples.get(0).getString("node").equals("3"));
assertTrue(tuples.get(1).getString("node").equals("4"));
@@ -600,7 +600,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 2);
assertTrue(tuples.get(0).getString("node").equals("3"));
@@ -618,7 +618,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 4);
assertTrue(tuples.get(0).getString("node").equals("1"));
assertTrue(tuples.get(1).getString("node").equals("2"));
@@ -637,7 +637,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 2);
assertTrue(tuples.get(0).getString("node").equals("3"));
assertTrue(tuples.get(1).getString("node").equals("4"));
@@ -654,7 +654,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 2);
assertTrue(tuples.get(0).getString("node").equals("3"));
@@ -672,7 +672,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 2);
assertTrue(tuples.get(0).getString("node").equals("6"));
@@ -690,7 +690,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 2);
assertTrue(tuples.get(0).getString("node").equals("3"));
@@ -708,7 +708,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 2);
assertTrue(tuples.get(0).getString("node").equals("2"));
@@ -994,7 +994,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 3);
assertTrue(tuples.get(0).getString("node").equals("jim"));
assertTrue(tuples.get(1).getString("node").equals("max"));
@@ -1015,7 +1015,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 4);
assertTrue(tuples.get(0).getString("node").equals("bill"));
assertTrue(tuples.get(0).getLong("level").equals(0L));
@@ -1053,7 +1053,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 3);
assertTrue(tuples.get(0).getString("node").equals("jim"));
assertTrue(tuples.get(1).getString("node").equals("max"));
@@ -1074,7 +1074,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 4);
assertTrue(tuples.get(0).getString("node").equals("bill"));
assertTrue(tuples.get(0).getLong("level").equals(0L));
@@ -1100,7 +1100,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 3);
assertTrue(tuples.get(0).getString("node").equals("ann"));
@@ -1116,7 +1116,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
hstream.setStreamContext(context);
tuples = getTuples(hstream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 3);
assertTrue(tuples.get(0).getString("node").equals("ann"));
@@ -1144,7 +1144,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 7);
assertTrue(tuples.get(0).getString("node").equals("ann"));
@@ -1187,7 +1187,7 @@ public class GraphExpressionTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, new FieldComparator("node", ComparatorOrder.ASCENDING));
+ tuples.sort(new FieldComparator("node", ComparatorOrder.ASCENDING));
assertTrue(tuples.size() == 7);
assertTrue(tuples.get(0).getString("node").equals("ann"));
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
index 70bf46edbaf..952d237e21b 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
@@ -21,7 +21,6 @@ import static org.apache.solr.client.solrj.io.stream.StreamAssert.assertMaps;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -3022,14 +3021,14 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, comp);
+ tuples.sort(comp);
// The tuples from the first topic (high priority) should be returned.
assertEquals(tuples.size(), 4);
assertOrder(tuples, 5, 6, 7, 8);
tuples = getTuples(stream);
- Collections.sort(tuples, comp);
+ tuples.sort(comp);
// The Tuples from the second topic (Low priority) should be returned.
assertEquals(tuples.size(), 6);
@@ -3088,14 +3087,14 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
stream.setStreamContext(context);
tuples = getTuples(stream);
- Collections.sort(tuples, comp);
+ tuples.sort(comp);
// The tuples from the first topic (high priority) should be returned.
assertEquals(tuples.size(), 4);
assertOrder(tuples, 5, 6, 7, 8);
tuples = getTuples(stream);
- Collections.sort(tuples, comp);
+ tuples.sort(comp);
// The Tuples from the second topic (Low priority) should be returned.
assertEquals(tuples.size(), 6);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
index 9f09bfd252d..67ca87d29a7 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
@@ -26,7 +26,6 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -694,8 +693,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertTrue(different);
- Collections.sort(tuples1, new FieldComparator("id", ComparatorOrder.ASCENDING));
- Collections.sort(tuples2, new FieldComparator("id", ComparatorOrder.ASCENDING));
+ tuples1.sort(new FieldComparator("id", ComparatorOrder.ASCENDING));
+ tuples2.sort(new FieldComparator("id", ComparatorOrder.ASCENDING));
for (int i = 0; i < tuples1.size(); i++) {
Tuple tuple1 = tuples1.get(i);
@@ -743,8 +742,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertTrue(different);
- Collections.sort(tuples10, new FieldComparator("id", ComparatorOrder.ASCENDING));
- Collections.sort(tuples11, new FieldComparator("id", ComparatorOrder.ASCENDING));
+ tuples10.sort(new FieldComparator("id", ComparatorOrder.ASCENDING));
+ tuples11.sort(new FieldComparator("id", ComparatorOrder.ASCENDING));
for (int i = 0; i < tuples10.size(); i++) {
Tuple tuple1 = tuples10.get(i);
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java
index ebb56065544..26ea3982721 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java
@@ -26,7 +26,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashSet;
@@ -114,7 +113,7 @@ public class SolrTestCaseHS extends SolrTestCaseJ4 {
int rows,
Collection<String> fieldNames) {
List<Doc> docList = new ArrayList<>(fullModel.values());
- Collections.sort(docList, sort);
+ docList.sort(sort);
@SuppressWarnings({"rawtypes"})
List sortedDocs = new ArrayList(rows);
for (Doc doc : docList) {