fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,365 Commits 22 Branches 339 Tags
Commit Graph

1340 Commits

Author SHA1 Message Date
Madhura Bhave
b93c2b9a9f Allow actuator endpoints to be used with mvcMatchers 
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.

For all other applications, AntPathRequestMatcher is used as
a delegate.

Closes gh-13962
 2018-08-16 15:41:02 -07:00
Andy Wilkinson
971caad6f8 Merge branch '2.0.x' 2018-08-16 10:19:05 +01:00
Andy Wilkinson
3e093035b4 Merge branch '1.5.x' into 2.0.x 2018-08-16 10:18:52 +01:00
Madhura Bhave
64f9d33956 Merge branch '2.0.x' 2018-08-15 16:58:21 -07:00
Johnny Lim
5f3f1a1f11 Polish 
Closes gh-14067
 2018-08-15 16:54:46 -07:00
Stephane Nicoll
d0f272960e Merge branch '2.0.x' 2018-08-15 10:43:28 +03:00
Johnny Lim
b4abccc07c Polish 
See gh-14049
 2018-08-15 10:43:04 +03:00
Andy Wilkinson
2756d87b3f Merge branch '2.0.x' 2018-08-09 11:15:13 +01:00
Andy Wilkinson
27f5e46587 Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null" 
Closes gh-14019
 2018-08-09 11:10:21 +01:00
artsiom
83fbdc6ea8 Fix NPE in FlywayEndpoint when migration.installedOn is null 
See gh-14019
 2018-08-09 11:10:02 +01:00
Stephane Nicoll
a12ca0a0dc Merge branch '2.0.x' 2018-08-08 16:05:34 +02:00
Stephane Nicoll
a023bd030a Add configurable timeout for Couchbase health indicator 
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.

Closes gh-13879
 2018-08-08 16:01:58 +02:00
Stephane Nicoll
13d5b00fe7 Merge branch '2.0.x' 2018-08-08 11:13:15 +02:00
Stephane Nicoll
fbf3c48bf8 Fix setter detection in configprops endpoint 
Previously, the setter of a property whose second letter is upper-case (
such as `oAuth2Uri`) was not detected properly. The JavaBean spec states
that, in such a case, the first letter should not be capitalized (i.e.
the setter should be `setoAuth2Uri` rather than `setOAuth2Uri`).

This commit makes sure that Jackson uses standard bean names and fixes
the setter detection algorithm to take this case into account.

Closes gh-13878
 2018-08-08 11:13:03 +02:00
Stephane Nicoll
6a2cb883a5 Merge branch '2.0.x' 2018-08-06 18:35:54 +02:00
Stephane Nicoll
f731f6aa39 Restore customization of HTTP trace request headers 
This commit restore the use of the `postProcessRequestHeaders` method
when overridden in a custom HttpExchangeTracer implementation.

Closes gh-13924
 2018-08-06 18:35:12 +02:00
Johnny Lim
7b72fe0ffa Polish 
See gh-13963
 2018-08-01 11:08:22 +02:00
Stephane Nicoll
0c1b229764 Merge branch '2.0.x' 2018-08-01 10:59:05 +02:00
Stephane Nicoll
4e45f36bd1 Clean basePath if necessary 
This commit makes sure that ServletEndpointRegistrar does not add a
duplicate `/` if the basePath is suffixed with it already

Close gh-13964
 2018-08-01 10:58:40 +02:00
Phillip Webb
80da9cf5eb Merge branch '2.0.x' 2018-07-29 09:28:56 +01:00
Phillip Webb
aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Phillip Webb
ce9c053cbf Fix checkstyle issues on master 
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:36:04 +01:00
Phillip Webb
a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb
63b609827e Fix checkstyle method order issues 
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:53 +01:00
Phillip Webb
e6a68b39a3 Fix checkstyle javadoc issues 
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Phillip Webb
7fc455654a Fix checkstyle ternary issues 
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Phillip Webb
b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Phillip Webb
9a9111af21 Support path discovery for main dispatcher servlet 
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
 2018-07-26 11:35:12 +01:00
Stephane Nicoll
1e7aa7c4bc Fix Spring Integration imports 2018-07-25 16:25:06 +02:00
Stephane Nicoll
af0aa11d15 Polish "Add reactive health indicator for Cassandra" 
Closes gh-13864
 2018-07-25 10:16:17 +02:00
artsiom
61c41555c8 Add reactive health indicator for Cassandra 
See gh-13864
 2018-07-25 10:16:17 +02:00
Stephane Nicoll
0c41384e50 Merge branch '2.0.x' 2018-07-25 09:18:04 +02:00
Stephane Nicoll
a25b6bd473 Restore support for TransactionAwareCacheDecorator 
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-13861
 2018-07-25 09:17:49 +02:00
Stephane Nicoll
f3ef7caf09 Merge branch '2.0.x' 2018-07-24 13:35:25 +02:00
Stephane Nicoll
829ac3fbef Prevent headers to be mutated 
This commit rework 1189ccc to prevent a mutate call on the original
headers map.

Closes gh-13871
 2018-07-24 13:34:49 +02:00
Stephane Nicoll
2ad548485c Merge branch '2.0.x' 2018-07-24 09:40:38 +02:00
Stephane Nicoll
1a0afc6bbe Polish "Use Collection.removeIf() where possible" 
Closes gh-13871
 2018-07-24 09:38:51 +02:00
dreis2211
1189ccc936 Use Collection.removeIf() where possible 
See gh-13871
 2018-07-24 09:38:34 +02:00
Stephane Nicoll
6dc0cb4f67 Merge branch '2.0.x' 2018-07-24 09:33:22 +02:00
Johannes Edmeier
ab1f8cf77b Add metric description and base unit to metrics endpoint 
See gh-13813
 2018-07-24 09:32:22 +02:00
Stephane Nicoll
237f2fb494 Merge branch '2.0.x' 2018-07-19 14:55:21 +02:00
Stephane Nicoll
592754d806 Polish "Make sure exception tag values are not empty in web metrics" 
Closes gh-13187
 2018-07-19 14:53:29 +02:00
Jon Schneider
ee37dc1c31 Make sure exception tag values are not empty in web metrics 
See gh-13187
 2018-07-19 14:40:58 +02:00
Andy Wilkinson
6a189cee06 Merge branch '2.0.x' 2018-07-17 19:26:08 +01:00
Andy Wilkinson
a57d0f0853 Reinstate order of WebMvcMetricsFilter 
Closes gh-13781
 2018-07-17 19:14:17 +01:00
Johnny Lim
58df752af4 Polish 
See gh-13790
 2018-07-17 10:25:38 +02:00
Andy Wilkinson
1ea91ece23 Merge branch '2.0.x' 2018-07-11 17:49:19 +01:00
Andy Wilkinson
cced3514a7 Polish 2018-07-11 17:49:10 +01:00
Stephane Nicoll
5fcf45c4d0 Merge branch '2.0.x' 2018-07-10 17:07:46 +02:00
Stephane Nicoll
3423c5dddb Detect DispatcherServlets registered via ServletRegistrationBean 
Previously, when a DispatcherServlet was registered via a
ServletRegistrationBean, the mappings endpoint did not expose any
information about it as it wasn't detected.

This commit fixes the detection of available DispatcherServlets in the
context so that the mappings endpoint include them all.

Closes gh-13186
 2018-07-10 17:06:36 +02:00