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
75639aa6
Commit
75639aa6
authored
May 17, 2018
by
Johnny Lim
Committed by
Stephane Nicoll
May 17, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-13192
parent
c271f8ef
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
19 deletions
+12
-19
AbstractHealthAggregator.java
...amework/boot/actuate/health/AbstractHealthAggregator.java
+3
-3
pom.xml
spring-boot-project/spring-boot-cli/pom.xml
+3
-3
howto.adoc
...oot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
+1
-1
ModifiedClassPathRunner.java
...testsupport/runner/classpath/ModifiedClassPathRunner.java
+1
-1
ServletContextInitializerBeans.java
...work/boot/web/servlet/ServletContextInitializerBeans.java
+4
-5
MockConfigurationPropertySource.java
...xt/properties/source/MockConfigurationPropertySource.java
+0
-6
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java
View file @
75639aa6
...
@@ -16,10 +16,10 @@
...
@@ -16,10 +16,10 @@
package
org
.
springframework
.
boot
.
actuate
.
health
;
package
org
.
springframework
.
boot
.
actuate
.
health
;
import
java.util.ArrayList
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
/**
* Base {@link HealthAggregator} implementation to allow subclasses to focus on
* Base {@link HealthAggregator} implementation to allow subclasses to focus on
...
@@ -33,8 +33,8 @@ public abstract class AbstractHealthAggregator implements HealthAggregator {
...
@@ -33,8 +33,8 @@ public abstract class AbstractHealthAggregator implements HealthAggregator {
@Override
@Override
public
final
Health
aggregate
(
Map
<
String
,
Health
>
healths
)
{
public
final
Health
aggregate
(
Map
<
String
,
Health
>
healths
)
{
List
<
Status
>
statusCandidates
=
new
ArrayList
<>();
List
<
Status
>
statusCandidates
=
healths
.
values
().
stream
()
healths
.
values
().
forEach
((
health
)
->
statusCandidates
.
add
(
health
.
getStatus
()
));
.
map
(
Health:
:
getStatus
).
collect
(
Collectors
.
toList
(
));
Status
status
=
aggregateStatus
(
statusCandidates
);
Status
status
=
aggregateStatus
(
statusCandidates
);
Map
<
String
,
Object
>
details
=
aggregateDetails
(
healths
);
Map
<
String
,
Object
>
details
=
aggregateDetails
(
healths
);
return
new
Health
.
Builder
(
status
,
details
).
build
();
return
new
Health
.
Builder
(
status
,
details
).
build
();
...
...
spring-boot-project/spring-boot-cli/pom.xml
View file @
75639aa6
...
@@ -333,9 +333,9 @@
...
@@ -333,9 +333,9 @@
<expandproperties
/>
<expandproperties
/>
</filterchain>
</filterchain>
</copy>
</copy>
<attachartifact
file=
"${project.build.directory}/homebrew/springboot.rb"
<attachartifact
file=
"${project.build.directory}/homebrew/springboot.rb"
classifier=
"homebrew"
type=
"rb"
/>
classifier=
"homebrew"
type=
"rb"
/>
</target>
</target>
</configuration>
</configuration>
</execution>
</execution>
<execution>
<execution>
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
View file @
75639aa6
...
@@ -1365,7 +1365,7 @@ use `setStatus(int)` rather `sendError(int)`. This prevents Jersey from committi
...
@@ -1365,7 +1365,7 @@ use `setStatus(int)` rather `sendError(int)`. This prevents Jersey from committi
response before Spring Security has had an opportunity to report an authentication or
response before Spring Security has had an opportunity to report an authentication or
authorization failure to the client.
authorization failure to the client.
The `jersey.config.server.response.setStatusOverSendError` pro
ep
rty must be set to `true`
The `jersey.config.server.response.setStatusOverSendError` pro
pe
rty must be set to `true`
on the application's `ResourceConfig` bean, as shown in the following example:
on the application's `ResourceConfig` bean, as shown in the following example:
[source,java,indent=0]
[source,java,indent=0]
...
...
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java
View file @
75639aa6
...
@@ -68,7 +68,7 @@ import org.springframework.util.StringUtils;
...
@@ -68,7 +68,7 @@ import org.springframework.util.StringUtils;
public
class
ModifiedClassPathRunner
extends
BlockJUnit4ClassRunner
{
public
class
ModifiedClassPathRunner
extends
BlockJUnit4ClassRunner
{
private
static
final
Pattern
INTELLIJ_CLASSPATH_JAR_PATTERN
=
Pattern
private
static
final
Pattern
INTELLIJ_CLASSPATH_JAR_PATTERN
=
Pattern
.
compile
(
".*classpath(\\d+)?.jar"
);
.
compile
(
".*classpath(\\d+)?
\\
.jar"
);
public
ModifiedClassPathRunner
(
Class
<?>
testClass
)
throws
InitializationError
{
public
ModifiedClassPathRunner
(
Class
<?>
testClass
)
throws
InitializationError
{
super
(
testClass
);
super
(
testClass
);
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
View file @
75639aa6
...
@@ -28,6 +28,7 @@ import java.util.List;
...
@@ -28,6 +28,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Map.Entry
;
import
java.util.Map.Entry
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
javax.servlet.Filter
;
import
javax.servlet.Filter
;
import
javax.servlet.MultipartConfigElement
;
import
javax.servlet.MultipartConfigElement
;
...
@@ -78,11 +79,9 @@ public class ServletContextInitializerBeans
...
@@ -78,11 +79,9 @@ public class ServletContextInitializerBeans
this
.
initializers
=
new
LinkedMultiValueMap
<>();
this
.
initializers
=
new
LinkedMultiValueMap
<>();
addServletContextInitializerBeans
(
beanFactory
);
addServletContextInitializerBeans
(
beanFactory
);
addAdaptableBeans
(
beanFactory
);
addAdaptableBeans
(
beanFactory
);
List
<
ServletContextInitializer
>
sortedInitializers
=
new
ArrayList
<>();
List
<
ServletContextInitializer
>
sortedInitializers
=
this
.
initializers
.
values
().
stream
()
this
.
initializers
.
values
().
forEach
((
contextInitializers
)
->
{
.
flatMap
(
value
->
value
.
stream
().
sorted
(
AnnotationAwareOrderComparator
.
INSTANCE
))
AnnotationAwareOrderComparator
.
sort
(
contextInitializers
);
.
collect
(
Collectors
.
toList
());
sortedInitializers
.
addAll
(
contextInitializers
);
});
this
.
sortedList
=
Collections
.
unmodifiableList
(
sortedInitializers
);
this
.
sortedList
=
Collections
.
unmodifiableList
(
sortedInitializers
);
}
}
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/MockConfigurationPropertySource.java
View file @
75639aa6
...
@@ -107,12 +107,6 @@ public class MockConfigurationPropertySource
...
@@ -107,12 +107,6 @@ public class MockConfigurationPropertySource
return
MockConfigurationPropertySource
.
this
.
getConfigurationProperty
(
name
);
return
MockConfigurationPropertySource
.
this
.
getConfigurationProperty
(
name
);
}
}
@Override
public
ConfigurationPropertyState
containsDescendantOf
(
ConfigurationPropertyName
name
)
{
return
ConfigurationPropertyState
.
UNKNOWN
;
}
}
}
}
}
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