Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
200de49c
Commit
200de49c
authored
Aug 12, 2019
by
lijuny
Committed by
Stephane Nicoll
Aug 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace Collection#addAll to call constructor
See gh-17847
parent
f8f3733e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
8 deletions
+6
-8
HealthIndicatorRegistryBeans.java
...te/autoconfigure/health/HealthIndicatorRegistryBeans.java
+2
-2
CompositeHandlerAdapter.java
...te/autoconfigure/web/servlet/CompositeHandlerAdapter.java
+1
-2
CompositeHandlerExceptionResolver.java
...figure/web/servlet/CompositeHandlerExceptionResolver.java
+2
-2
CompositeHandlerMapping.java
...te/autoconfigure/web/servlet/CompositeHandlerMapping.java
+1
-2
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorRegistryBeans.java
View file @
200de49c
...
@@ -38,8 +38,8 @@ final class HealthIndicatorRegistryBeans {
...
@@ -38,8 +38,8 @@ final class HealthIndicatorRegistryBeans {
}
}
static
HealthIndicatorRegistry
get
(
ApplicationContext
applicationContext
)
{
static
HealthIndicatorRegistry
get
(
ApplicationContext
applicationContext
)
{
Map
<
String
,
HealthIndicator
>
indicators
=
new
LinkedHashMap
<>(
);
Map
<
String
,
HealthIndicator
>
indicators
=
new
LinkedHashMap
<>(
indicators
.
putAll
(
applicationContext
.
getBeansOfType
(
HealthIndicator
.
class
));
applicationContext
.
getBeansOfType
(
HealthIndicator
.
class
));
if
(
ClassUtils
.
isPresent
(
"reactor.core.publisher.Flux"
,
null
))
{
if
(
ClassUtils
.
isPresent
(
"reactor.core.publisher.Flux"
,
null
))
{
new
ReactiveHealthIndicators
().
get
(
applicationContext
).
forEach
(
indicators:
:
putIfAbsent
);
new
ReactiveHealthIndicators
().
get
(
applicationContext
).
forEach
(
indicators:
:
putIfAbsent
);
}
}
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java
View file @
200de49c
...
@@ -74,8 +74,7 @@ class CompositeHandlerAdapter implements HandlerAdapter {
...
@@ -74,8 +74,7 @@ class CompositeHandlerAdapter implements HandlerAdapter {
}
}
private
List
<
HandlerAdapter
>
extractAdapters
()
{
private
List
<
HandlerAdapter
>
extractAdapters
()
{
List
<
HandlerAdapter
>
list
=
new
ArrayList
<>();
List
<
HandlerAdapter
>
list
=
new
ArrayList
<>(
this
.
beanFactory
.
getBeansOfType
(
HandlerAdapter
.
class
).
values
());
list
.
addAll
(
this
.
beanFactory
.
getBeansOfType
(
HandlerAdapter
.
class
).
values
());
list
.
remove
(
this
);
list
.
remove
(
this
);
AnnotationAwareOrderComparator
.
sort
(
list
);
AnnotationAwareOrderComparator
.
sort
(
list
);
return
list
;
return
list
;
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolver.java
View file @
200de49c
...
@@ -55,8 +55,8 @@ class CompositeHandlerExceptionResolver implements HandlerExceptionResolver {
...
@@ -55,8 +55,8 @@ class CompositeHandlerExceptionResolver implements HandlerExceptionResolver {
}
}
private
List
<
HandlerExceptionResolver
>
extractResolvers
()
{
private
List
<
HandlerExceptionResolver
>
extractResolvers
()
{
List
<
HandlerExceptionResolver
>
list
=
new
ArrayList
<>(
);
List
<
HandlerExceptionResolver
>
list
=
new
ArrayList
<>(
list
.
addAll
(
this
.
beanFactory
.
getBeansOfType
(
HandlerExceptionResolver
.
class
).
values
());
this
.
beanFactory
.
getBeansOfType
(
HandlerExceptionResolver
.
class
).
values
());
list
.
remove
(
this
);
list
.
remove
(
this
);
AnnotationAwareOrderComparator
.
sort
(
list
);
AnnotationAwareOrderComparator
.
sort
(
list
);
if
(
list
.
isEmpty
())
{
if
(
list
.
isEmpty
())
{
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerMapping.java
View file @
200de49c
...
@@ -56,8 +56,7 @@ class CompositeHandlerMapping implements HandlerMapping {
...
@@ -56,8 +56,7 @@ class CompositeHandlerMapping implements HandlerMapping {
}
}
private
List
<
HandlerMapping
>
extractMappings
()
{
private
List
<
HandlerMapping
>
extractMappings
()
{
List
<
HandlerMapping
>
list
=
new
ArrayList
<>();
List
<
HandlerMapping
>
list
=
new
ArrayList
<>(
this
.
beanFactory
.
getBeansOfType
(
HandlerMapping
.
class
).
values
());
list
.
addAll
(
this
.
beanFactory
.
getBeansOfType
(
HandlerMapping
.
class
).
values
());
list
.
remove
(
this
);
list
.
remove
(
this
);
AnnotationAwareOrderComparator
.
sort
(
list
);
AnnotationAwareOrderComparator
.
sort
(
list
);
return
list
;
return
list
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment