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
844a8d80
Commit
844a8d80
authored
Aug 10, 2019
by
lijuny
Committed by
Stephane Nicoll
Aug 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify some code
See gh-17832
parent
835108e5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
9 deletions
+5
-9
ConfigurationPropertiesReportEndpoint.java
...ext/properties/ConfigurationPropertiesReportEndpoint.java
+1
-2
AbstractWebFluxEndpointHandlerMapping.java
...t/web/reactive/AbstractWebFluxEndpointHandlerMapping.java
+1
-2
AbstractWebMvcEndpointHandlerMapping.java
...int/web/servlet/AbstractWebMvcEndpointHandlerMapping.java
+1
-2
Info.java
...main/java/org/springframework/boot/actuate/info/Info.java
+1
-2
StartupInfoLogger.java
...main/java/org/springframework/boot/StartupInfoLogger.java
+1
-1
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
View file @
844a8d80
...
@@ -131,8 +131,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
...
@@ -131,8 +131,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
private
Map
<
String
,
Object
>
getConfigurationPropertiesBeans
(
ApplicationContext
context
,
private
Map
<
String
,
Object
>
getConfigurationPropertiesBeans
(
ApplicationContext
context
,
ConfigurationBeanFactoryMetadata
beanFactoryMetadata
)
{
ConfigurationBeanFactoryMetadata
beanFactoryMetadata
)
{
Map
<
String
,
Object
>
beans
=
new
HashMap
<>();
Map
<
String
,
Object
>
beans
=
new
HashMap
<>(
context
.
getBeansWithAnnotation
(
ConfigurationProperties
.
class
));
beans
.
putAll
(
context
.
getBeansWithAnnotation
(
ConfigurationProperties
.
class
));
if
(
beanFactoryMetadata
!=
null
)
{
if
(
beanFactoryMetadata
!=
null
)
{
beans
.
putAll
(
beanFactoryMetadata
.
getBeansWithFactoryAnnotation
(
ConfigurationProperties
.
class
));
beans
.
putAll
(
beanFactoryMetadata
.
getBeansWithFactoryAnnotation
(
ConfigurationProperties
.
class
));
}
}
...
...
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java
View file @
844a8d80
...
@@ -332,8 +332,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi
...
@@ -332,8 +332,7 @@ public abstract class AbstractWebFluxEndpointHandlerMapping extends RequestMappi
}
}
private
Map
<
String
,
Object
>
getArguments
(
ServerWebExchange
exchange
,
Map
<
String
,
String
>
body
)
{
private
Map
<
String
,
Object
>
getArguments
(
ServerWebExchange
exchange
,
Map
<
String
,
String
>
body
)
{
Map
<
String
,
Object
>
arguments
=
new
LinkedHashMap
<>();
Map
<
String
,
Object
>
arguments
=
new
LinkedHashMap
<>(
getTemplateVariables
(
exchange
));
arguments
.
putAll
(
getTemplateVariables
(
exchange
));
if
(
body
!=
null
)
{
if
(
body
!=
null
)
{
arguments
.
putAll
(
body
);
arguments
.
putAll
(
body
);
}
}
...
...
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java
View file @
844a8d80
...
@@ -310,8 +310,7 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
...
@@ -310,8 +310,7 @@ public abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
}
}
private
Map
<
String
,
Object
>
getArguments
(
HttpServletRequest
request
,
Map
<
String
,
String
>
body
)
{
private
Map
<
String
,
Object
>
getArguments
(
HttpServletRequest
request
,
Map
<
String
,
String
>
body
)
{
Map
<
String
,
Object
>
arguments
=
new
LinkedHashMap
<>();
Map
<
String
,
Object
>
arguments
=
new
LinkedHashMap
<>(
getTemplateVariables
(
request
));
arguments
.
putAll
(
getTemplateVariables
(
request
));
String
matchAllRemainingPathSegmentsVariable
=
this
.
operation
.
getRequestPredicate
()
String
matchAllRemainingPathSegmentsVariable
=
this
.
operation
.
getRequestPredicate
()
.
getMatchAllRemainingPathSegmentsVariable
();
.
getMatchAllRemainingPathSegmentsVariable
();
if
(
matchAllRemainingPathSegmentsVariable
!=
null
)
{
if
(
matchAllRemainingPathSegmentsVariable
!=
null
)
{
...
...
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java
View file @
844a8d80
...
@@ -40,8 +40,7 @@ public final class Info {
...
@@ -40,8 +40,7 @@ public final class Info {
private
final
Map
<
String
,
Object
>
details
;
private
final
Map
<
String
,
Object
>
details
;
private
Info
(
Builder
builder
)
{
private
Info
(
Builder
builder
)
{
Map
<
String
,
Object
>
content
=
new
LinkedHashMap
<>();
Map
<
String
,
Object
>
content
=
new
LinkedHashMap
<>(
builder
.
content
);
content
.
putAll
(
builder
.
content
);
this
.
details
=
Collections
.
unmodifiableMap
(
content
);
this
.
details
=
Collections
.
unmodifiableMap
(
content
);
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
View file @
844a8d80
...
@@ -126,7 +126,7 @@ class StartupInfoLogger {
...
@@ -126,7 +126,7 @@ class StartupInfoLogger {
}
}
private
void
appendPid
(
StringBuilder
message
)
{
private
void
appendPid
(
StringBuilder
message
)
{
append
(
message
,
"with PID "
,
()
->
new
ApplicationPid
()
);
append
(
message
,
"with PID "
,
ApplicationPid:
:
new
);
}
}
private
void
appendContext
(
StringBuilder
message
)
{
private
void
appendContext
(
StringBuilder
message
)
{
...
...
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