diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java index bd452e2cca..bbad0c1fbb 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java @@ -199,7 +199,7 @@ public class EndpointDocumentation { private Collection getEndpoints() { List endpoints = new ArrayList<>( this.mvcEndpoints.getEndpoints()); - Collections.sort(endpoints, new Comparator() { + endpoints.sort(new Comparator() { @Override public int compare(MvcEndpoint o1, MvcEndpoint o2) { return o1.getPath().compareTo(o2.getPath()); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java index 357dacd433..aed327ccab 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java @@ -149,7 +149,7 @@ public class EndpointAutoConfiguration { if (this.publicMetrics != null) { publicMetrics.addAll(this.publicMetrics); } - Collections.sort(publicMetrics, AnnotationAwareOrderComparator.INSTANCE); + publicMetrics.sort(AnnotationAwareOrderComparator.INSTANCE); return new MetricsEndpoint(publicMetrics); } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java index cb1b52ade3..9a05319486 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java @@ -18,7 +18,6 @@ package org.springframework.boot.actuate.health; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -80,7 +79,7 @@ public class OrderedHealthAggregator extends AbstractHealthAggregator { return Status.UNKNOWN; } // Sort given Status instances by configured order - Collections.sort(filteredCandidates, new StatusComparator(this.statusOrder)); + filteredCandidates.sort(new StatusComparator(this.statusOrder)); return filteredCandidates.get(0); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java index d30bbabb42..ac6e1b8a96 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java @@ -60,7 +60,7 @@ class AutoConfigurationSorter { // Initially sort alphabetically Collections.sort(orderedClassNames); // Then sort by order - Collections.sort(orderedClassNames, new Comparator() { + orderedClassNames.sort(new Comparator() { @Override public int compare(String o1, String o2) { diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java index 0e1f776265..15a422f47d 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java @@ -94,9 +94,8 @@ class ServiceCapabilitiesReportGenerator { private List getSortedDependencies(InitializrServiceMetadata metadata) { ArrayList dependencies = new ArrayList<>(metadata.getDependencies()); - Collections.sort(dependencies, new Comparator() { - @Override - public int compare(Dependency o1, Dependency o2) { + dependencies.sort(new Comparator() { + @Override public int compare(Dependency o1, Dependency o2) { return o1.getId().compareTo(o2.getId()); } }); diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java index 9f9172455d..fdac83bb42 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java @@ -124,7 +124,7 @@ public class GroovyCompiler { .load(SpringBootAstTransformation.class)) { this.transformations.add(transformation); } - Collections.sort(this.transformations, AnnotationAwareOrderComparator.INSTANCE); + this.transformations.sort(AnnotationAwareOrderComparator.INSTANCE); } /** diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index e02525e691..984bfde51d 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -234,7 +234,7 @@ public abstract class MainClassFinder { static T doWithMainClasses(JarFile jarFile, String classesLocation, MainClassCallback callback) throws IOException { List classEntries = getClassEntries(jarFile, classesLocation); - Collections.sort(classEntries, new ClassEntryComparator()); + classEntries.sort(new ClassEntryComparator()); for (JarEntry entry : classEntries) { try (InputStream inputStream = new BufferedInputStream( jarFile.getInputStream(entry))) { diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index ba0767e68c..8bb0e2936a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -1309,7 +1309,7 @@ public class SpringApplication { private static Set asUnmodifiableOrderedSet(Collection elements) { List list = new ArrayList<>(); list.addAll(elements); - Collections.sort(list, AnnotationAwareOrderComparator.INSTANCE); + list.sort(AnnotationAwareOrderComparator.INSTANCE); return new LinkedHashSet<>(list); } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java index 5d2fa55ad0..800d605fd8 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java @@ -17,7 +17,6 @@ package org.springframework.boot.context.config; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.springframework.beans.BeanUtils; @@ -110,7 +109,7 @@ public class DelegatingApplicationContextInitializer implements @SuppressWarnings({ "unchecked", "rawtypes" }) private void applyInitializers(ConfigurableApplicationContext context, List> initializers) { - Collections.sort(initializers, new AnnotationAwareOrderComparator()); + initializers.sort(new AnnotationAwareOrderComparator()); for (ApplicationContextInitializer initializer : initializers) { initializer.initialize(context); } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java index 779e5a3529..b5a566551d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java @@ -133,7 +133,7 @@ public class JavaLoggingSystem extends AbstractLoggingSystem { while (names.hasMoreElements()) { result.add(getLoggerConfiguration(names.nextElement())); } - Collections.sort(result, CONFIGURATION_COMPARATOR); + result.sort(CONFIGURATION_COMPARATOR); return Collections.unmodifiableList(result); } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java index b78142cc1a..231111d456 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java @@ -220,7 +220,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem { for (LoggerConfig loggerConfig : configuration.getLoggers().values()) { result.add(convertLoggerConfiguration(loggerConfig)); } - Collections.sort(result, CONFIGURATION_COMPARATOR); + result.sort(CONFIGURATION_COMPARATOR); return result; } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index 8633366b8d..7547b51afe 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -20,7 +20,6 @@ import java.net.URL; import java.security.CodeSource; import java.security.ProtectionDomain; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -213,7 +212,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem { for (ch.qos.logback.classic.Logger logger : getLoggerContext().getLoggerList()) { result.add(getLoggerConfiguration(logger)); } - Collections.sort(result, CONFIGURATION_COMPARATOR); + result.sort(CONFIGURATION_COMPARATOR); return result; } diff --git a/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPageRegistrarBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPageRegistrarBeanPostProcessor.java index 186b3d6604..4c0a4e6d43 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPageRegistrarBeanPostProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/server/ErrorPageRegistrarBeanPostProcessor.java @@ -78,7 +78,7 @@ public class ErrorPageRegistrarBeanPostProcessor // Look up does not include the parent context this.registrars = new ArrayList<>(this.beanFactory .getBeansOfType(ErrorPageRegistrar.class, false, false).values()); - Collections.sort(this.registrars, AnnotationAwareOrderComparator.INSTANCE); + this.registrars.sort(AnnotationAwareOrderComparator.INSTANCE); this.registrars = Collections.unmodifiableList(this.registrars); } return this.registrars; diff --git a/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerFactoryCustomizerBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerFactoryCustomizerBeanPostProcessor.java index 0f65be6c8a..9cbb8bc6f5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerFactoryCustomizerBeanPostProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/server/WebServerFactoryCustomizerBeanPostProcessor.java @@ -114,7 +114,7 @@ public class WebServerFactoryCustomizerBeanPostProcessor if (this.customizers == null) { // Look up does not include the parent context this.customizers = new ArrayList<>(getWebServerFactoryCustomizerBeans()); - Collections.sort(this.customizers, AnnotationAwareOrderComparator.INSTANCE); + this.customizers.sort(AnnotationAwareOrderComparator.INSTANCE); this.customizers = Collections.unmodifiableList(this.customizers); } return this.customizers; diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java index 450199aa36..15a467a82d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java @@ -238,7 +238,7 @@ public class ServletContextInitializerBeans } } beans.addAll(map.entrySet()); - Collections.sort(beans, comparator); + beans.sort(comparator); return beans; }