Commit Graph

1855 Commits

Author SHA1 Message Date
Madhura Bhave ca41a3c1cc Merge branch '2.0.x' 2018-04-19 14:22:25 -07:00
Madhura Bhave c93f7ddff6 Make truststore & keystore optional on SslStoreProvider
Fixes gh-11395
2018-04-19 14:21:57 -07:00
Stephane Nicoll 36e33a3b94 Merge branch '2.0.x' 2018-04-19 09:26:56 +02:00
evernat 91fa76a9a2 Add reference to javamelody starter
Closes gh-12877
2018-04-19 09:25:38 +02:00
Madhura Bhave 5d949cc736 Merge branch '2.0.x' 2018-04-18 10:48:22 -07:00
Madhura Bhave 35af166750 Fix tests
See gh-11380
2018-04-18 10:47:37 -07:00
Madhura Bhave a8707c520c Merge branch '2.0.x' 2018-04-18 10:28:44 -07:00
Madhura Bhave cab9bff4f4 Log included profiles according to the processing order
This commit includes some refactoring of active profiles
processing. Previously, there was a LIFO Queue for adding active
profiles. Profiles that were added last, were processed first.
Because of this reverse ordering, profiles were prepended to the
environment to preserve the order in which they were logged.
This however didn't work for "included" profiles as they were
prepended to the environment even though they were processed after
the active profile. In this commit, profiles are processed in a FIFO manner
and processed as they're found.

Fixes gh-11380
2018-04-18 10:03:12 -07:00
Stephane Nicoll e72306b33e Merge branch '2.0.x' 2018-04-18 09:50:09 +02:00
Stephane Nicoll 026d8bed5f Fix additional missing semicolon on sample code
Closes gh-12895
2018-04-18 09:49:15 +02:00
Jienan Duan 90ae14ec21 Add missing semicolon on sample code
See gh-12895
2018-04-18 09:47:54 +02:00
Stephane Nicoll c7645604a6 Merge branch '2.0.x' 2018-04-18 09:42:08 +02:00
Stephane Nicoll 2b98b11c12 Polish "Less object instantiation in WebMvcTags"
Closes gh-12894
2018-04-18 09:41:40 +02:00
Jon Schneider d676147680 Less object instantiation in WebMvcTags
See gh-12894
2018-04-18 09:38:23 +02:00
Stephane Nicoll c43eb89823 Make sure that finalName is read only
Closes gh-12608
2018-04-17 17:53:18 +02:00
Stephane Nicoll b2f34f5c20 Remove spring.provides
Closes gh-12435
2018-04-17 17:46:43 +02:00
Stephane Nicoll a85998f4c3 Polish "Add auto-configuration for Hibernate metrics"
Closes gh-12550
2018-04-17 13:46:27 +02:00
Rui Figueira b6b92ba937 Add auto-configuration for Hibernate metrics
All Hibernate entityManagerFactories are automatically instrumented
and their statistics are included into Micrometer using its
HibernateMetrics binder.

Closes gh-12550
2018-04-17 13:23:18 +02:00
Stephane Nicoll 3cb2246e7a Merge branch '2.0.x' 2018-04-16 11:33:59 +02:00
Stephane Nicoll 0bc7bef5e5 Properly handle InvalidEndpointRequestException
This commit makes sure that `InvalidEndpointRequestException` is wrapped
in a `ReflectionException` when invoked via JMX.

Closes gh-12857
2018-04-16 11:33:22 +02:00
Stephane Nicoll f139dc3608 Merge branch '2.0.x' 2018-04-16 08:43:57 +02:00
Stephane Nicoll 2002115637 Add doc ref for hierarchical name mapping 2018-04-16 08:43:46 +02:00
Stephane Nicoll 12541d7efc Merge branch '2.0.x' 2018-04-16 08:16:30 +02:00
Stephane Nicoll 1c0f589c01 Simplify Joinfaces community starter entry
See gh-12867
2018-04-16 08:16:18 +02:00
Stephane Nicoll 0fd743cdb1 Merge branch '2.0.x' 2018-04-16 08:10:17 +02:00
dreis2211 2bbf438c36 Fix duplicate words in comments
Closes gh-12866
2018-04-16 08:09:40 +02:00
Stephane Nicoll 1583d342cc Merge branch '2.0.x' 2018-04-13 16:40:27 +02:00
Stephane Nicoll bfe31e6688 Fix broken build 2018-04-13 16:40:15 +02:00
Stephane Nicoll d0b2b9b1a5 Merge branch '2.0.x' 2018-04-13 16:29:44 +02:00
Stephane Nicoll fa542bacc0 Translate user-defined exception when invoking JMX operation
This commit makes sure to respect the MBeanServer#invoke contract by
wrapping any user-defined exception in an MBeanException. Also, any
exception not from the JDK is translated, as it may lead to unexpected
issue on the client if that class isn't present. This is consistent
with our operation result mapping strategy.

Closes gh-10448
2018-04-13 16:26:04 +02:00
Stephane Nicoll fb60716e1b Merge branch '2.0.x' 2018-04-13 15:19:06 +02:00
Stephane Nicoll 2204d5f750 Polish 2018-04-13 15:18:42 +02:00
Stephane Nicoll 31441a7590 Add a note to explain how to disable the web server
See gh-12853
2018-04-13 15:18:08 +02:00
Stephane Nicoll 2fd5cebe31 Merge branch '2.0.x' 2018-04-13 14:51:07 +02:00
Stephane Nicoll 7550f92ea5 Clarify DataSource metrics section for custom DataSources
Closes gh-12851
2018-04-13 14:50:44 +02:00
Brian Clozel 02b0b6ff9c Merge branch '2.0.x' 2018-04-13 11:50:03 +02:00
Brian Clozel 29a719dfb3 Upgrade to Undertow 1.4.24.Final
This commit also updates tests since UNDERTOW-1260 has been fixed in
this release.

Closes gh-12852
2018-04-13 11:48:09 +02:00
Brian Clozel 33c7401e10 Merge branch '2.0.x' 2018-04-12 22:52:51 +02:00
Brian Clozel b2e7be17ab Polish gh-11514
As pointed out by Rossen in gh-11514 comments, a handler might commit
the response and then send an error signal in the pipeline. In this
case, adding a callback to `beforeCommit` is useless because it won't be
triggered. In those cases, we need to collect metrics right away.
2018-04-12 22:50:16 +02:00
Madhura Bhave 20acd2a89b Merge branch '2.0.x' 2018-04-12 10:33:11 -07:00
Madhura Bhave 9c7612e681 Fix NPE in WaitStrategy used for test containers 2018-04-12 10:30:36 -07:00
Brian Clozel 5e1d0d7bdd Merge branch '2.0.x' 2018-04-12 18:02:04 +02:00
Brian Clozel b7695fabab Switch to Reactor Bismuth SNAPSHOTs 2018-04-12 18:01:33 +02:00
Vedran Pavic 7b9c5a3dc3 Use Jersey BOM in dependency management
Closes gh-12847
2018-04-12 15:58:32 +02:00
Vedran Pavic ec4f054497 Upgrade to Jersey 2.27
Closes gh-12847
2018-04-12 15:56:19 +02:00
Stephane Nicoll ed19f20ca0 Merge branch '2.0.x' 2018-04-12 15:48:57 +02:00
Stephane Nicoll 38bd4bd58c Stop associating an Executor bean to Quartz
This commits make sure that the Quartz auto-configuration no longer
associates an `Executor` bean if present in the context as Quartz offers
properties to tune it, which would mutate and lead to unexpected
results.

Closes gh-12823
2018-04-12 15:48:20 +02:00
Stephane Nicoll e4e56bbcc3 Migrate to ApplicationContextRunner 2018-04-12 15:48:20 +02:00
Brian Clozel 70826f5478 Merge branch '2.0.x' 2018-04-12 14:51:34 +02:00
Brian Clozel 3fa8fe85af Deprecate RouterFunctionMetrics
Spring Boot now deploys both annotation-based and functional endpoints
under the same `HttpHandler`; this means the currently auto-configured
`MetricsWebFilter` is instrumenting all endpoints to produce metrics.

There is no need for a WebFlux functional specific support.
This commit removes mentions of `RouterFunctionMetrics` in the docs and
deprecates that class.

Closes gh-12833
2018-04-12 12:08:44 +02:00