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
65ab82b3
Commit
65ab82b3
authored
Nov 13, 2019
by
thelproad
Committed by
Stephane Nicoll
Nov 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant code
See gh-19000
parent
0c5bb603
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
8 deletions
+4
-8
ServletManagementChildContextConfiguration.java
...b/servlet/ServletManagementChildContextConfiguration.java
+1
-1
EndpointMediaTypes.java
...amework/boot/actuate/endpoint/web/EndpointMediaTypes.java
+1
-1
AutoConfigurationImportSelector.java
...k/boot/autoconfigure/AutoConfigurationImportSelector.java
+1
-1
OnResourceCondition.java
...ork/boot/autoconfigure/condition/OnResourceCondition.java
+1
-5
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java
View file @
65ab82b3
...
...
@@ -190,7 +190,7 @@ class ServletManagementChildContextConfiguration {
private
void
customizeServer
(
Server
server
)
{
RequestLog
requestLog
=
server
.
getRequestLog
();
if
(
requestLog
!=
null
&&
requestLog
instanceof
CustomRequestLog
)
{
if
(
requestLog
instanceof
CustomRequestLog
)
{
customizeRequestLog
((
CustomRequestLog
)
requestLog
);
}
}
...
...
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointMediaTypes.java
View file @
65ab82b3
...
...
@@ -51,7 +51,7 @@ public class EndpointMediaTypes {
* @since 2.2.0
*/
public
EndpointMediaTypes
(
String
...
producedAndConsumed
)
{
this
((
producedAndConsumed
!=
null
)
?
Arrays
.
asList
(
producedAndConsumed
)
:
(
List
<
String
>)
null
);
this
((
producedAndConsumed
!=
null
)
?
Arrays
.
asList
(
producedAndConsumed
)
:
null
);
}
/**
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelector.java
View file @
65ab82b3
...
...
@@ -279,7 +279,7 @@ public class AutoConfigurationImportSelector implements DeferredImportSelector,
protected
final
List
<
String
>
asList
(
AnnotationAttributes
attributes
,
String
name
)
{
String
[]
value
=
attributes
.
getStringArray
(
name
);
return
Arrays
.
asList
(
(
value
!=
null
)
?
value
:
new
String
[
0
]
);
return
Arrays
.
asList
(
value
);
}
private
void
fireAutoConfigurationImportEvents
(
List
<
String
>
configurations
,
Set
<
String
>
exclusions
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnResourceCondition.java
View file @
65ab82b3
...
...
@@ -24,7 +24,6 @@ import org.springframework.context.annotation.Condition;
import
org.springframework.context.annotation.ConditionContext
;
import
org.springframework.core.Ordered
;
import
org.springframework.core.annotation.Order
;
import
org.springframework.core.io.DefaultResourceLoader
;
import
org.springframework.core.io.ResourceLoader
;
import
org.springframework.core.type.AnnotatedTypeMetadata
;
import
org.springframework.util.Assert
;
...
...
@@ -39,14 +38,11 @@ import org.springframework.util.MultiValueMap;
@Order
(
Ordered
.
HIGHEST_PRECEDENCE
+
20
)
class
OnResourceCondition
extends
SpringBootCondition
{
private
final
ResourceLoader
defaultResourceLoader
=
new
DefaultResourceLoader
();
@Override
public
ConditionOutcome
getMatchOutcome
(
ConditionContext
context
,
AnnotatedTypeMetadata
metadata
)
{
MultiValueMap
<
String
,
Object
>
attributes
=
metadata
.
getAllAnnotationAttributes
(
ConditionalOnResource
.
class
.
getName
(),
true
);
ResourceLoader
loader
=
(
context
.
getResourceLoader
()
!=
null
)
?
context
.
getResourceLoader
()
:
this
.
defaultResourceLoader
;
ResourceLoader
loader
=
context
.
getResourceLoader
();
List
<
String
>
locations
=
new
ArrayList
<>();
collectValues
(
locations
,
attributes
.
get
(
"resources"
));
Assert
.
isTrue
(!
locations
.
isEmpty
(),
...
...
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