Skip to content

Commit 4a189bd

Browse files
emacampolophilwebb
authored andcommitted
Replace Collections.sort() with direct sort call
Replace existing `Collections.sort(...)` calls with `.sort(...)` directly on the collection instance. See gh-9781
1 parent 04fdec6 commit 4a189bd

File tree

15 files changed

+16
-20
lines changed

15 files changed

+16
-20
lines changed

spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void handle(MvcResult mvcResult) throws Exception {
199199
private Collection<? extends MvcEndpoint> getEndpoints() {
200200
List<? extends MvcEndpoint> endpoints = new ArrayList<>(
201201
this.mvcEndpoints.getEndpoints());
202-
Collections.sort(endpoints, new Comparator<MvcEndpoint>() {
202+
endpoints.sort(new Comparator<MvcEndpoint>() {
203203
@Override
204204
public int compare(MvcEndpoint o1, MvcEndpoint o2) {
205205
return o1.getPath().compareTo(o2.getPath());

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public MetricsEndpoint metricsEndpoint() {
149149
if (this.publicMetrics != null) {
150150
publicMetrics.addAll(this.publicMetrics);
151151
}
152-
Collections.sort(publicMetrics, AnnotationAwareOrderComparator.INSTANCE);
152+
publicMetrics.sort(AnnotationAwareOrderComparator.INSTANCE);
153153
return new MetricsEndpoint(publicMetrics);
154154
}
155155

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import java.util.ArrayList;
2020
import java.util.Arrays;
21-
import java.util.Collections;
2221
import java.util.Comparator;
2322
import java.util.List;
2423

@@ -80,7 +79,7 @@ protected Status aggregateStatus(List<Status> candidates) {
8079
return Status.UNKNOWN;
8180
}
8281
// Sort given Status instances by configured order
83-
Collections.sort(filteredCandidates, new StatusComparator(this.statusOrder));
82+
filteredCandidates.sort(new StatusComparator(this.statusOrder));
8483
return filteredCandidates.get(0);
8584
}
8685

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public List<String> getInPriorityOrder(Collection<String> classNames) {
6060
// Initially sort alphabetically
6161
Collections.sort(orderedClassNames);
6262
// Then sort by order
63-
Collections.sort(orderedClassNames, new Comparator<String>() {
63+
orderedClassNames.sort(new Comparator<String>() {
6464

6565
@Override
6666
public int compare(String o1, String o2) {

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@ private void reportAvailableDependencies(InitializrServiceMetadata metadata,
9494

9595
private List<Dependency> getSortedDependencies(InitializrServiceMetadata metadata) {
9696
ArrayList<Dependency> dependencies = new ArrayList<>(metadata.getDependencies());
97-
Collections.sort(dependencies, new Comparator<Dependency>() {
98-
@Override
99-
public int compare(Dependency o1, Dependency o2) {
97+
dependencies.sort(new Comparator<Dependency>() {
98+
@Override public int compare(Dependency o1, Dependency o2) {
10099
return o1.getId().compareTo(o2.getId());
101100
}
102101
});

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public GroovyCompiler(final GroovyCompilerConfiguration configuration) {
124124
.load(SpringBootAstTransformation.class)) {
125125
this.transformations.add(transformation);
126126
}
127-
Collections.sort(this.transformations, AnnotationAwareOrderComparator.INSTANCE);
127+
this.transformations.sort(AnnotationAwareOrderComparator.INSTANCE);
128128
}
129129

130130
/**

spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public static String findSingleMainClass(JarFile jarFile, String classesLocation
234234
static <T> T doWithMainClasses(JarFile jarFile, String classesLocation,
235235
MainClassCallback<T> callback) throws IOException {
236236
List<JarEntry> classEntries = getClassEntries(jarFile, classesLocation);
237-
Collections.sort(classEntries, new ClassEntryComparator());
237+
classEntries.sort(new ClassEntryComparator());
238238
for (JarEntry entry : classEntries) {
239239
try (InputStream inputStream = new BufferedInputStream(
240240
jarFile.getInputStream(entry))) {

spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ private static void close(ApplicationContext context) {
13091309
private static <E> Set<E> asUnmodifiableOrderedSet(Collection<E> elements) {
13101310
List<E> list = new ArrayList<>();
13111311
list.addAll(elements);
1312-
Collections.sort(list, AnnotationAwareOrderComparator.INSTANCE);
1312+
list.sort(AnnotationAwareOrderComparator.INSTANCE);
13131313
return new LinkedHashSet<>(list);
13141314
}
13151315

spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.springframework.boot.context.config;
1818

1919
import java.util.ArrayList;
20-
import java.util.Collections;
2120
import java.util.List;
2221

2322
import org.springframework.beans.BeanUtils;
@@ -110,7 +109,7 @@ private ApplicationContextInitializer<?> instantiateInitializer(Class<?> context
110109
@SuppressWarnings({ "unchecked", "rawtypes" })
111110
private void applyInitializers(ConfigurableApplicationContext context,
112111
List<ApplicationContextInitializer<?>> initializers) {
113-
Collections.sort(initializers, new AnnotationAwareOrderComparator());
112+
initializers.sort(new AnnotationAwareOrderComparator());
114113
for (ApplicationContextInitializer initializer : initializers) {
115114
initializer.initialize(context);
116115
}

spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public List<LoggerConfiguration> getLoggerConfigurations() {
133133
while (names.hasMoreElements()) {
134134
result.add(getLoggerConfiguration(names.nextElement()));
135135
}
136-
Collections.sort(result, CONFIGURATION_COMPARATOR);
136+
result.sort(CONFIGURATION_COMPARATOR);
137137
return Collections.unmodifiableList(result);
138138
}
139139

spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public List<LoggerConfiguration> getLoggerConfigurations() {
220220
for (LoggerConfig loggerConfig : configuration.getLoggers().values()) {
221221
result.add(convertLoggerConfiguration(loggerConfig));
222222
}
223-
Collections.sort(result, CONFIGURATION_COMPARATOR);
223+
result.sort(CONFIGURATION_COMPARATOR);
224224
return result;
225225
}
226226

spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.security.CodeSource;
2121
import java.security.ProtectionDomain;
2222
import java.util.ArrayList;
23-
import java.util.Collections;
2423
import java.util.List;
2524
import java.util.Set;
2625

@@ -213,7 +212,7 @@ public List<LoggerConfiguration> getLoggerConfigurations() {
213212
for (ch.qos.logback.classic.Logger logger : getLoggerContext().getLoggerList()) {
214213
result.add(getLoggerConfiguration(logger));
215214
}
216-
Collections.sort(result, CONFIGURATION_COMPARATOR);
215+
result.sort(CONFIGURATION_COMPARATOR);
217216
return result;
218217
}
219218

spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPageRegistrarBeanPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private Collection<ErrorPageRegistrar> getRegistrars() {
7878
// Look up does not include the parent context
7979
this.registrars = new ArrayList<>(this.beanFactory
8080
.getBeansOfType(ErrorPageRegistrar.class, false, false).values());
81-
Collections.sort(this.registrars, AnnotationAwareOrderComparator.INSTANCE);
81+
this.registrars.sort(AnnotationAwareOrderComparator.INSTANCE);
8282
this.registrars = Collections.unmodifiableList(this.registrars);
8383
}
8484
return this.registrars;

spring-boot/src/main/java/org/springframework/boot/web/server/WebServerFactoryCustomizerBeanPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private Collection<WebServerFactoryCustomizer<?>> getCustomizers() {
114114
if (this.customizers == null) {
115115
// Look up does not include the parent context
116116
this.customizers = new ArrayList<>(getWebServerFactoryCustomizerBeans());
117-
Collections.sort(this.customizers, AnnotationAwareOrderComparator.INSTANCE);
117+
this.customizers.sort(AnnotationAwareOrderComparator.INSTANCE);
118118
this.customizers = Collections.unmodifiableList(this.customizers);
119119
}
120120
return this.customizers;

spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public int compare(Entry<String, T> o1, Entry<String, T> o2) {
238238
}
239239
}
240240
beans.addAll(map.entrySet());
241-
Collections.sort(beans, comparator);
241+
beans.sort(comparator);
242242
return beans;
243243
}
244244

0 commit comments

Comments
 (0)