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
14c9f91a
Commit
14c9f91a
authored
Aug 22, 2017
by
Johnny Lim
Committed by
Stephane Nicoll
Aug 22, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-10054
parent
ac4219b1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
17 deletions
+17
-17
HealthIndicatorFactory.java
...framework/boot/actuate/health/HealthIndicatorFactory.java
+1
-1
HealthStatusHttpMapper.java
...framework/boot/actuate/health/HealthStatusHttpMapper.java
+2
-2
ActiveMQAutoConfigurationTests.java
...onfigure/jms/activemq/ActiveMQAutoConfigurationTests.java
+5
-5
howto.adoc
spring-boot-docs/src/main/asciidoc/howto.adoc
+3
-3
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+4
-4
RestClientExcludeFilter.java
...est/autoconfigure/web/client/RestClientExcludeFilter.java
+1
-1
TomcatEmbeddedWebappClassLoader.java
.../web/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
+1
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorFactory.java
View file @
14c9f91a
...
@@ -32,7 +32,7 @@ public class HealthIndicatorFactory {
...
@@ -32,7 +32,7 @@ public class HealthIndicatorFactory {
* Create a {@link CompositeHealthIndicator} based on the specified health indicators.
* Create a {@link CompositeHealthIndicator} based on the specified health indicators.
* @param healthAggregator the {@link HealthAggregator}
* @param healthAggregator the {@link HealthAggregator}
* @param healthIndicators the {@link HealthIndicator} instances mapped by name
* @param healthIndicators the {@link HealthIndicator} instances mapped by name
* @return a
n
{@link HealthIndicator} that delegates to the specified
* @return a {@link HealthIndicator} that delegates to the specified
* {@code healthIndicators}.
* {@code healthIndicators}.
*/
*/
public
HealthIndicator
createHealthIndicator
(
public
HealthIndicator
createHealthIndicator
(
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.java
View file @
14c9f91a
...
@@ -46,7 +46,7 @@ public class HealthStatusHttpMapper {
...
@@ -46,7 +46,7 @@ public class HealthStatusHttpMapper {
/**
/**
* Set specific status mappings.
* Set specific status mappings.
* @param statusMapping a map of
status code to {@code HttpStatus}
* @param statusMapping a map of
health status code to HTTP status code
*/
*/
public
void
setStatusMapping
(
Map
<
String
,
Integer
>
statusMapping
)
{
public
void
setStatusMapping
(
Map
<
String
,
Integer
>
statusMapping
)
{
Assert
.
notNull
(
statusMapping
,
"StatusMapping must not be null"
);
Assert
.
notNull
(
statusMapping
,
"StatusMapping must not be null"
);
...
@@ -55,7 +55,7 @@ public class HealthStatusHttpMapper {
...
@@ -55,7 +55,7 @@ public class HealthStatusHttpMapper {
/**
/**
* Add specific status mappings to the existing set.
* Add specific status mappings to the existing set.
* @param statusMapping a map of
status code to {@code HttpStatus}
* @param statusMapping a map of
health status code to HTTP status code
*/
*/
public
void
addStatusMapping
(
Map
<
String
,
Integer
>
statusMapping
)
{
public
void
addStatusMapping
(
Map
<
String
,
Integer
>
statusMapping
)
{
Assert
.
notNull
(
statusMapping
,
"StatusMapping must not be null"
);
Assert
.
notNull
(
statusMapping
,
"StatusMapping must not be null"
);
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java
View file @
14c9f91a
...
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock;
...
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock;
import
static
org
.
mockito
.
Mockito
.
mockingDetails
;
import
static
org
.
mockito
.
Mockito
.
mockingDetails
;
/**
/**
* Tests for {@link ActiveMQAutoConfiguration}
* Tests for {@link ActiveMQAutoConfiguration}
.
*
*
* @author Andy Wilkinson
* @author Andy Wilkinson
* @author Aurélien Leboulanger
* @author Aurélien Leboulanger
...
@@ -68,7 +68,7 @@ public class ActiveMQAutoConfigurationTests {
...
@@ -68,7 +68,7 @@ public class ActiveMQAutoConfigurationTests {
}
}
@Test
@Test
public
void
default
sConnectionFactoryAre
Applied
()
{
public
void
default
ConnectionFactoryIs
Applied
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmptyConfiguration
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
EmptyConfiguration
.
class
)
.
withPropertyValues
(
"spring.activemq.pool.enabled=false"
)
.
withPropertyValues
(
"spring.activemq.pool.enabled=false"
)
.
run
((
context
)
->
{
.
run
((
context
)
->
{
...
@@ -96,7 +96,7 @@ public class ActiveMQAutoConfigurationTests {
...
@@ -96,7 +96,7 @@ public class ActiveMQAutoConfigurationTests {
}
}
@Test
@Test
public
void
customConnectionFactory
Are
Applied
()
{
public
void
customConnectionFactory
Is
Applied
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmptyConfiguration
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
EmptyConfiguration
.
class
)
.
withPropertyValues
(
"spring.activemq.pool.enabled=false"
,
.
withPropertyValues
(
"spring.activemq.pool.enabled=false"
,
"spring.activemq.brokerUrl=vm://localhost?useJmx=false&broker.persistent=false"
,
"spring.activemq.brokerUrl=vm://localhost?useJmx=false&broker.persistent=false"
,
...
@@ -124,7 +124,7 @@ public class ActiveMQAutoConfigurationTests {
...
@@ -124,7 +124,7 @@ public class ActiveMQAutoConfigurationTests {
}
}
@Test
@Test
public
void
default
sPooledConnectionFactoryAre
Applied
()
{
public
void
default
PooledConnectionFactoryIs
Applied
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmptyConfiguration
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
EmptyConfiguration
.
class
)
.
withPropertyValues
(
"spring.activemq.pool.enabled=true"
)
.
withPropertyValues
(
"spring.activemq.pool.enabled=true"
)
.
run
((
context
)
->
{
.
run
((
context
)
->
{
...
@@ -160,7 +160,7 @@ public class ActiveMQAutoConfigurationTests {
...
@@ -160,7 +160,7 @@ public class ActiveMQAutoConfigurationTests {
}
}
@Test
@Test
public
void
customPooledConnectionFactory
Are
Applied
()
{
public
void
customPooledConnectionFactory
Is
Applied
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmptyConfiguration
.
class
)
this
.
contextRunner
.
withUserConfiguration
(
EmptyConfiguration
.
class
)
.
withPropertyValues
(
"spring.activemq.pool.enabled=true"
,
.
withPropertyValues
(
"spring.activemq.pool.enabled=true"
,
"spring.activemq.pool.blockIfFull=false"
,
"spring.activemq.pool.blockIfFull=false"
,
...
...
spring-boot-docs/src/main/asciidoc/howto.adoc
View file @
14c9f91a
...
@@ -75,7 +75,7 @@ rules of thumb:
...
@@ -75,7 +75,7 @@ rules of thumb:
are `server.port`, `server.address` etc. In a running Actuator app look at the
are `server.port`, `server.address` etc. In a running Actuator app look at the
`configprops` endpoint.
`configprops` endpoint.
* Look for uses of the `bind` method on the `Binder` to pull configuration values explicitly out of the
* Look for uses of the `bind` method on the `Binder` to pull configuration values explicitly out of the
`Environment` in a relaxed manner. It is often
is
used with a prefix.
`Environment` in a relaxed manner. It is often used with a prefix.
* Look for `@Value` annotations that bind directly to the `Environment`.
* Look for `@Value` annotations that bind directly to the `Environment`.
* Look for `@ConditionalOnExpression` annotations that switch features on and off in
* Look for `@ConditionalOnExpression` annotations that switch features on and off in
response to SpEL expressions, normally evaluated with placeholders resolved from the
response to SpEL expressions, normally evaluated with placeholders resolved from the
...
@@ -125,7 +125,7 @@ TIP: The `Environment` will already have been prepared with all the usual proper
...
@@ -125,7 +125,7 @@ TIP: The `Environment` will already have been prepared with all the usual proper
that Spring Boot loads by default. It is therefore possible to get the location of the
that Spring Boot loads by default. It is therefore possible to get the location of the
file from the environment. This example adds the `custom-resource` property source at the
file from the environment. This example adds the `custom-resource` property source at the
end of the list so that a key defined in any of the usual other locations takes
end of the list so that a key defined in any of the usual other locations takes
precedence. A custom implementation may obviously define
s
another order.
precedence. A custom implementation may obviously define another order.
NOTE: While using `@PropertySource` on your `@SpringBootApplication` seems convenient and
NOTE: While using `@PropertySource` on your `@SpringBootApplication` seems convenient and
easy enough to load a custom resource in the `Environment`, we do not recommend it as
easy enough to load a custom resource in the `Environment`, we do not recommend it as
...
@@ -835,7 +835,7 @@ nuclear option is to add your own `TomcatServletWebServerFactory`.
...
@@ -835,7 +835,7 @@ nuclear option is to add your own `TomcatServletWebServerFactory`.
[[howto-enable-multiple-connectors-in-tomcat]]
[[howto-enable-multiple-connectors-in-tomcat]]
=== Enable Multiple Connectors with Tomcat
=== Enable Multiple Connectors with Tomcat
Add a `org.apache.catalina.connector.Connector` to the
Add a
n
`org.apache.catalina.connector.Connector` to the
`TomcatServletWebServerFactory` which can allow multiple connectors, e.g. HTTP and
`TomcatServletWebServerFactory` which can allow multiple connectors, e.g. HTTP and
HTTPS connector:
HTTPS connector:
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
14c9f91a
...
@@ -560,7 +560,7 @@ the search order becomes:
...
@@ -560,7 +560,7 @@ the search order becomes:
This search ordering allows you to specify default values in one configuration file
This search ordering allows you to specify default values in one configuration file
and then selectively override those values in another. You can provide default values
and then selectively override those values in another. You can provide default values
for you application in `application.properties` (or whatever other basename you choose
for you
r
application in `application.properties` (or whatever other basename you choose
with `spring.config.name`) in one of the default locations. These default values can
with `spring.config.name`) in one of the default locations. These default values can
then be overriden at runtime with a different file located in one of the custom
then be overriden at runtime with a different file located in one of the custom
locations.
locations.
...
@@ -2872,7 +2872,7 @@ language feature). Example:
...
@@ -2872,7 +2872,7 @@ language feature). Example:
[[boot-features-security-custom-user-info-client]]
[[boot-features-security-custom-user-info-client]]
==== Client
==== Client
To make your web-app into an OAuth2 client you can simply add `@EnableOAuth2Client` and
To make your web-app into an OAuth2 client you can simply add `@EnableOAuth2Client` and
Spring Boot will create a `OAuth2ClientContext` and `OAuth2ProtectedResourceDetails` that
Spring Boot will create a
n
`OAuth2ClientContext` and `OAuth2ProtectedResourceDetails` that
are necessary to create an `OAuth2RestOperations`. Spring Boot does not automatically
are necessary to create an `OAuth2RestOperations`. Spring Boot does not automatically
create such bean but you can easily create your own:
create such bean but you can easily create your own:
...
@@ -4279,7 +4279,7 @@ If the connection to InfluxDB requires a user and password, you can set the
...
@@ -4279,7 +4279,7 @@ If the connection to InfluxDB requires a user and password, you can set the
`spring.influx.user` and `spring.influx.password` properties accordingly.
`spring.influx.user` and `spring.influx.password` properties accordingly.
InfluxDB relies on OkHttp. If you need to tune the http client `InfluxDB` uses behind the
InfluxDB relies on OkHttp. If you need to tune the http client `InfluxDB` uses behind the
scenes, you can register a `OkHttpClient.Builder` bean.
scenes, you can register a
n
`OkHttpClient.Builder` bean.
...
@@ -4443,7 +4443,7 @@ There are several ways to customize the underlying `javax.cache.cacheManager`:
...
@@ -4443,7 +4443,7 @@ There are several ways to customize the underlying `javax.cache.cacheManager`:
invoked with the reference of the `CacheManager` for full customization.
invoked with the reference of the `CacheManager` for full customization.
TIP: If a standard `javax.cache.CacheManager` bean is defined, it is wrapped
TIP: If a standard `javax.cache.CacheManager` bean is defined, it is wrapped
automatically in a `org.springframework.cache.CacheManager` implementation that the
automatically in a
n
`org.springframework.cache.CacheManager` implementation that the
abstraction expects. No further customization is applied on it.
abstraction expects. No further customization is applied on it.
...
...
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientExcludeFilter.java
View file @
14c9f91a
...
@@ -41,7 +41,7 @@ class RestClientExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
...
@@ -41,7 +41,7 @@ class RestClientExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
static
{
static
{
Set
<
Class
<?>>
includes
=
new
LinkedHashSet
<>();
Set
<
Class
<?>>
includes
=
new
LinkedHashSet
<>();
if
(
ClassUtils
.
isPresent
(
"com.fasterxml.jackson.databind.Module"
,
if
(
ClassUtils
.
isPresent
(
DATABIND_MODULE_CLASS_NAME
,
RestClientExcludeFilter
.
class
.
getClassLoader
()))
{
RestClientExcludeFilter
.
class
.
getClassLoader
()))
{
try
{
try
{
includes
.
add
(
Class
.
forName
(
DATABIND_MODULE_CLASS_NAME
,
true
,
includes
.
add
(
Class
.
forName
(
DATABIND_MODULE_CLASS_NAME
,
true
,
...
...
spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java
View file @
14c9f91a
...
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
...
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
/**
/**
* Extension of Tomcat's {@link WebappClassLoader} that does not consider the
* Extension of Tomcat's {@link WebappClassLoader} that does not consider the
* {@link ClassLoader#getSystemClassLoader() system classloader}. This is required to
to
* {@link ClassLoader#getSystemClassLoader() system classloader}. This is required to
* ensure that any custom context classloader is always used (as is the case with some
* ensure that any custom context classloader is always used (as is the case with some
* executable archives).
* executable archives).
*
*
...
...
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