Skip to content

Commit 200de49

Browse files
lijunyzzZsnicoll
authored andcommitted
Replace Collection#addAll to call constructor
See spring-projectsgh-17847
1 parent f8f3733 commit 200de49

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorRegistryBeans.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ private HealthIndicatorRegistryBeans() {
3838
}
3939

4040
static HealthIndicatorRegistry get(ApplicationContext applicationContext) {
41-
Map<String, HealthIndicator> indicators = new LinkedHashMap<>();
42-
indicators.putAll(applicationContext.getBeansOfType(HealthIndicator.class));
41+
Map<String, HealthIndicator> indicators = new LinkedHashMap<>(
42+
applicationContext.getBeansOfType(HealthIndicator.class));
4343
if (ClassUtils.isPresent("reactor.core.publisher.Flux", null)) {
4444
new ReactiveHealthIndicators().get(applicationContext).forEach(indicators::putIfAbsent);
4545
}

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ private Optional<HandlerAdapter> getAdapter(Object handler) {
7474
}
7575

7676
private List<HandlerAdapter> extractAdapters() {
77-
List<HandlerAdapter> list = new ArrayList<>();
78-
list.addAll(this.beanFactory.getBeansOfType(HandlerAdapter.class).values());
77+
List<HandlerAdapter> list = new ArrayList<>(this.beanFactory.getBeansOfType(HandlerAdapter.class).values());
7978
list.remove(this);
8079
AnnotationAwareOrderComparator.sort(list);
8180
return list;

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public ModelAndView resolveException(HttpServletRequest request, HttpServletResp
5555
}
5656

5757
private List<HandlerExceptionResolver> extractResolvers() {
58-
List<HandlerExceptionResolver> list = new ArrayList<>();
59-
list.addAll(this.beanFactory.getBeansOfType(HandlerExceptionResolver.class).values());
58+
List<HandlerExceptionResolver> list = new ArrayList<>(
59+
this.beanFactory.getBeansOfType(HandlerExceptionResolver.class).values());
6060
list.remove(this);
6161
AnnotationAwareOrderComparator.sort(list);
6262
if (list.isEmpty()) {

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerMapping.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ public HandlerExecutionChain getHandler(HttpServletRequest request) throws Excep
5656
}
5757

5858
private List<HandlerMapping> extractMappings() {
59-
List<HandlerMapping> list = new ArrayList<>();
60-
list.addAll(this.beanFactory.getBeansOfType(HandlerMapping.class).values());
59+
List<HandlerMapping> list = new ArrayList<>(this.beanFactory.getBeansOfType(HandlerMapping.class).values());
6160
list.remove(this);
6261
AnnotationAwareOrderComparator.sort(list);
6362
return list;

0 commit comments

Comments
 (0)