7418: Stop using Collections sort method

Reviewed-by: aptmac, hdafgard
openjdk · Oct 26, 2021 · 77580fe · 77580fe
1 parent ef36b79
commit 77580fe
Show file tree

Hide file tree

Showing 42 changed files with 90 additions and 129 deletions.
diff --git a/...ation/org.openjdk.jmc.commands/src/main/java/org/openjdk/jmc/commands/CommandsPlugin.java b/...ation/org.openjdk.jmc.commands/src/main/java/org/openjdk/jmc/commands/CommandsPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -35,7 +35,6 @@
 import java.io.PrintStream;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -172,7 +171,7 @@ public List<String> getCategories() {
 			categories.add(c.getCategory());
 		}
 		List<String> list = new ArrayList<>(categories);
-		Collections.sort(list);
+		list.sort(null);
 		return list;
 	}
 
@@ -188,7 +187,7 @@ public List<Command> getCommands(String category) {
 				list.add(c);
 			}
 		}
-		Collections.sort(list);
+		list.sort(null);
 		return list;
 	}
 

diff --git a/...ds/src/main/java/org/openjdk/jmc/commands/internal/executables/PrintSystemProperties.java b/...ds/src/main/java/org/openjdk/jmc/commands/internal/executables/PrintSystemProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -34,7 +34,6 @@
 
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.openjdk.jmc.commands.IExecute;
@@ -53,7 +52,7 @@ public boolean execute(Statement statement, PrintStream out) {
 				keys.add((String) key);
 			}
 		}
-		Collections.sort(keys);
+		keys.sort(null);
 		for (String key : keys) {
 			out.println(key + "=" + System.getProperties().get(key)); //$NON-NLS-1$
 		}

diff --git a/...sistence/src/main/java/org/openjdk/jmc/console/persistence/editors/PersistenceEditor.java b/...sistence/src/main/java/org/openjdk/jmc/console/persistence/editors/PersistenceEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -37,7 +37,6 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -62,7 +61,6 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.EditorPart;
-
 import org.openjdk.jmc.common.unit.KindOfQuantity;
 import org.openjdk.jmc.common.unit.UnitLookup;
 import org.openjdk.jmc.console.persistence.PersistencePlugin;
@@ -198,8 +196,7 @@ private static void addDefaultCharts(SectionPartManager spm, PersistenceReader p
 		}
 		// Order by size descending and add charts
 		List<Entry<KindOfQuantity<?>, List<MRI>>> allAttributes = new ArrayList<>(mrisByKind.entrySet());
-		Collections.sort(allAttributes, new Comparator<Entry<KindOfQuantity<?>, List<MRI>>>() {
-
+		allAttributes.sort(new Comparator<Entry<KindOfQuantity<?>, List<MRI>>>() {
 			@Override
 			public int compare(Entry<KindOfQuantity<?>, List<MRI>> e1, Entry<KindOfQuantity<?>, List<MRI>> e2) {
 				return e2.getValue().size() - e1.getValue().size();

diff --git a/...ication/src/main/java/org/openjdk/jmc/console/ui/notification/tab/TriggerSectionPart.java b/...ication/src/main/java/org/openjdk/jmc/console/ui/notification/tab/TriggerSectionPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,7 +32,6 @@
  */
 package org.openjdk.jmc.console.ui.notification.tab;
 
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -68,7 +67,6 @@
 import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
-
 import org.openjdk.jmc.alert.AlertPlugin;
 import org.openjdk.jmc.console.ui.actions.MBeanAutomaticRefreshAction;
 import org.openjdk.jmc.console.ui.notification.NotificationPlugin;
@@ -415,7 +413,7 @@ private boolean askConfirmation(Shell shell, TriggerRule ... rules) {
 		for (TriggerRule rule : rules) {
 			names.add(rule.getName());
 		}
-		Collections.sort(names);
+		names.sort(null);
 
 		StringBuilder namesBuilder = new StringBuilder();
 		int index = 0;

diff --git a/.../main/java/org/openjdk/jmc/console/ui/editor/internal/ConsolePageContributionFactory.java b/.../main/java/org/openjdk/jmc/console/ui/editor/internal/ConsolePageContributionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -33,7 +33,6 @@
 package org.openjdk.jmc.console.ui.editor.internal;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.logging.Level;
@@ -93,7 +92,7 @@ public static List<IConfigurationElement> getContributionsFor(IWorkbenchPart edi
 				}
 			}
 		}
-		Collections.sort(pageElements, PAGE_COMPARATOR);
+		pageElements.sort(PAGE_COMPARATOR);
 		return pageElements;
 	}
 

diff --git a/...g/openjdk/jmc/flightrecorder/controlpanel/ui/configuration/model/xml/JFCXMLValidator.java b/...g/openjdk/jmc/flightrecorder/controlpanel/ui/configuration/model/xml/JFCXMLValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -39,7 +39,6 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -242,7 +241,7 @@ public static Set<String> createQualifiedVariableSet(
 				}
 			}
 		}
-		Collections.sort(variables);
+		variables.sort(null);
 		return new LinkedHashSet<>(variables);
 	}
 

diff --git a/...va/org/openjdk/jmc/flightrecorder/controlpanel/ui/model/EventConfigurationRepository.java b/...va/org/openjdk/jmc/flightrecorder/controlpanel/ui/model/EventConfigurationRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -105,7 +105,7 @@ public boolean replaceOriginalContentsFor(IEventConfiguration workingCopy) {
 	 */
 	@Override
 	public void notifyObservers(Object arg) {
-		Collections.sort(m_templates, COMPARATOR);
+		m_templates.sort(COMPARATOR);
 		super.notifyObservers(arg);
 	}
 

diff --git a/...htrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/AttributeConfiguration.java b/...htrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/AttributeConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -36,7 +36,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -117,7 +116,7 @@ public void addAttributesFromRules(Collection<IRule> rules) {
 					pageAttributes.add(new AttributeGroup(rule.getName(), unique));
 				}
 			}
-			Collections.sort(pageAttributes, (p1, p2) -> p1.groupTitle.compareTo(p2.groupTitle));
+			pageAttributes.sort((p1, p2) -> p1.groupTitle.compareTo(p2.groupTitle));
 			if (rest.size() > 0) {
 				pageAttributes.add(new AttributeGroup(Messages.ATTRIBUTE_CONFIG_SHARED_GROUP_NAME, rest));
 			}

diff --git a/...lightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/EventTypeFolderNode.java b/...lightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/EventTypeFolderNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -33,7 +33,6 @@
 package org.openjdk.jmc.flightrecorder.ui;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
@@ -173,7 +172,7 @@ private void sortChildren() {
 				((EventTypeFolderNode) c).sortChildren();
 			}
 		}
-		Collections.sort(getChildren(), new Comparator<Object>() {
+		getChildren().sort(new Comparator<Object>() {
 
 			@Override
 			public int compare(Object o1, Object o2) {

diff --git a/...jdk.jmc.joverflow/src/main/java/org/openjdk/jmc/joverflow/batch/BatchProblemRecorder.java b/...jdk.jmc.joverflow/src/main/java/org/openjdk/jmc/joverflow/batch/BatchProblemRecorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -33,7 +33,6 @@
 package org.openjdk.jmc.joverflow.batch;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -284,7 +283,7 @@ private <T extends AbstractClusterNode> void generateFullRefChainClusters(
 			clusterList.add(cluster.getFinalCluster(referer));
 		}
 
-		Collections.sort(clusterList, ReferencedObjCluster.DEFAULT_COMPARATOR);
+		clusterList.sort(ReferencedObjCluster.DEFAULT_COMPARATOR);
 	}
 
 	private List<List<? extends ReferencedObjCluster>> getProblematicDataClustersWithNearestField(int minOvhd) {
@@ -369,7 +368,7 @@ private <T extends AbstractClusterNode> void generateFieldClusters(
 			clusterList.add(cluster.getFinalCluster(referer));
 		}
 
-		Collections.sort(clusterList, ReferencedObjCluster.DEFAULT_COMPARATOR);
+		clusterList.sort(ReferencedObjCluster.DEFAULT_COMPARATOR);
 	}
 
 	private abstract static class AbstractClusterNode {

diff --git a/....joverflow/src/main/java/org/openjdk/jmc/joverflow/descriptors/CollectionDescriptors.java b/....joverflow/src/main/java/org/openjdk/jmc/joverflow/descriptors/CollectionDescriptors.java
@@ -33,7 +33,6 @@
 package org.openjdk.jmc.joverflow.descriptors;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.logging.Logger;
@@ -135,7 +134,7 @@ public ArrayList<CollectionClassDescriptor> getOverheadsByClass() {
 			result.add(factory.getClassDescriptor());
 		}
 
-		Collections.sort(result, new Comparator<CollectionClassDescriptor>() {
+		result.sort(new Comparator<CollectionClassDescriptor>() {
 			@Override
 			public int compare(CollectionClassDescriptor d1, CollectionClassDescriptor d2) {
 				long o1 = d1.getTotalOverhead();

diff --git a/...rg.openjdk.jmc.joverflow/src/main/java/org/openjdk/jmc/joverflow/heap/model/Snapshot.java b/...rg.openjdk.jmc.joverflow/src/main/java/org/openjdk/jmc/joverflow/heap/model/Snapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -36,7 +36,6 @@
 import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -606,7 +605,7 @@ public Snapshot buildSnapshot(ReadBuffer readBuf) {
 			JavaObjectTable objectTable = objTableBuilder.buildJavaObjectTable(classes);
 			resolveSuperclasses(classes);
 			recheckPointerSize(objectTable, readBuf);
-			Collections.sort(roots); // More interesting roots will be scanned first
+			roots.sort(null); // More interesting roots will be scanned first
 
 			Snapshot snapshot = new Snapshot(hprofPointerSize, pointerSize, objHeaderSize, objAlignment,
 					usingNarrowPointers, roughTotalObjectSize, roots, objectTable, objIdToPosInObjectTable, classes,

diff --git a/....openjdk.jmc.joverflow/src/main/java/org/openjdk/jmc/joverflow/stats/LengthHistogram.java b/....openjdk.jmc.joverflow/src/main/java/org/openjdk/jmc/joverflow/stats/LengthHistogram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -33,7 +33,6 @@
 package org.openjdk.jmc.joverflow.stats;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -67,7 +66,7 @@ public List<Entry> getPrunedAndSortedEntries(int sizeThreshold) {
 		}
 		result.add(entryForOthers);
 
-		Collections.sort(result, SPECIAL_LENGTH_COMPARATOR);
+		result.sort(SPECIAL_LENGTH_COMPARATOR);
 		return result;
 	}
 

diff --git a/....openjdk.jmc.joverflow/src/main/java/org/openjdk/jmc/joverflow/stats/ObjectHistogram.java b/....openjdk.jmc.joverflow/src/main/java/org/openjdk/jmc/joverflow/stats/ObjectHistogram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -33,7 +33,6 @@
 package org.openjdk.jmc.joverflow.stats;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -88,7 +87,7 @@ public List<Entry> getListSortedByInclusiveSize(int minInclusiveSize) {
 			}
 		}
 
-		Collections.sort(result, new Comparator<Entry>() {
+		result.sort(new Comparator<Entry>() {
 			@Override
 			public int compare(Entry o1, Entry o2) {
 				long diff = (o2.getTotalInclusiveSize() - o1.getTotalInclusiveSize());
@@ -144,7 +143,7 @@ public List<ProblemFieldsEntry> getListSortedByNullFieldsOvhd(float percentile)
 		ArrayList<ProblemFieldsEntry> result = findClassesWithNullFields(percentile);
 		checkForSuperclassesDefiningProblemFields(result);
 
-		Collections.sort(result, PROBLEM_OVERHEAD_COMPARATOR);
+		result.sort(PROBLEM_OVERHEAD_COMPARATOR);
 		return result;
 	}
 
@@ -162,7 +161,7 @@ public List<ProblemFieldsEntry> getListSortedByUnusedHiByteFieldsOvhd(float perc
 		ArrayList<ProblemFieldsEntry> result = findClassesWithUnusedHiByteFields(percentile);
 		checkForSuperclassesDefiningProblemFields(result);
 
-		Collections.sort(result, PROBLEM_OVERHEAD_COMPARATOR);
+		result.sort(PROBLEM_OVERHEAD_COMPARATOR);
 		return result;
 	}
 

diff --git a/...joverflow/src/main/java/org/openjdk/jmc/joverflow/stats/PrimitiveArrayDuplicationMap.java b/...joverflow/src/main/java/org/openjdk/jmc/joverflow/stats/PrimitiveArrayDuplicationMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -34,7 +34,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 
 import org.openjdk.jmc.joverflow.heap.model.JavaValueArray;
@@ -118,7 +117,7 @@ void calculateFinalStats() {
 			}
 		}
 
-		Collections.sort(result, new Comparator<DupArrayStats.Entry>() {
+		result.sort(new Comparator<DupArrayStats.Entry>() {
 			@Override
 			public int compare(DupArrayStats.Entry e1, DupArrayStats.Entry e2) {
 				if (e1.overhead > e2.overhead) {