Commit Graph

17131 Commits

Author SHA1 Message Date
Phillip Webb
a94ab673a3 Add health endpoint 'show-components' support
Add a `show-components` property under `management.endpoint.health` and
`management.endpoint.health.group.<name>` that can be used to change
when components are displayed.

Prior to this commit it was only possible to set `show-details` which
offered an "all or nothing" approach to the resulting JSON. The new
switch allows component information to be displayed whilst still hiding
potentially sensitive details returned from the actual `HealthIndicator`.

Closes gh-15076
2019-09-26 16:17:28 -07:00
Phillip Webb
69c561a69a Rename health JSON 'details' to 'components' in v3
Update the health endpoint so the nested components are now exposed
under `components` rather than `details` when v3 of the actuator
REST API is being used.

This distinction helps to clarify the difference between composite
health (health composed of other health components) and health
details (technology specific information gathered by the indicator).

Since this is a breaking change for the REST API, it is only returned
for v3 payloads. Requests made accepting only a v2 response will have
JSON provided in the original form.

Closes gh-17929
2019-09-26 16:16:23 -07:00
Phillip Webb
cd1b7c1a9c Test v3 actuator API with loggers endpoint
Update `LoggersEndpointWebIntegrationTests` to ensure that the new
v3 media type can be used.

See gh-17929
2019-09-26 16:16:19 -07:00
Phillip Webb
deb9d67cef Add Actuator ApiVersion support and bump version
Add `ApiVersion` enum that can be injected into actuator endpoints if
they need to support more than one API revision.

Spring MVC, WebFlux and Jersey integrations now detect the API version
based on the HTTP accept header. If the request explicitly accepts a
`application/vnd.spring-boot.actuator.v` media type then the version
is set from the header. If no explicit Spring Boot media type is
accepted then the latest `ApiVersion` is assumed.

A new v3 API revision has also been introduced to allow upcoming health
endpoint format changes. By default all endpoints now consume and
can produce v3, v2 and `application/json` media types.

See gh-17929
2019-09-26 16:16:15 -07:00
Phillip Webb
d83238aaab Merge branch '2.1.x'
Closes gh-18369
2019-09-26 12:14:35 -07:00
Phillip Webb
050460f635 Check factory bean for EntityManager datasource
Update `DataSourceInitializedPublisher` to fallback to the
`LocalContainerEntityManagerFactoryBean` if the
`javax.persistence.nonJtaDataSource` property is not defined.

As of Hibernate 4.3 the property is no longer set if the `EntityManager`
is created from a `PersistenceUnitInfo` instance rather than actual
properties.

Although this is being addressed in Hibernate issue HHH-13432, it's
not strictly a requirement of the JPA spec that the property is set.

Fixes gh-17061
2019-09-26 12:14:13 -07:00
Brian Clozel
b15e26662a Upgrade to Spring Doc Resources 0.1.3
Closes gh-18293
2019-09-26 15:04:57 +02:00
dreis2211
4262aab446 Fix deprecation warnings caused by BodyInserters.fromObject
See gh-18349
2019-09-25 13:57:17 +01:00
Stephane Nicoll
48bf9a58c6 Upgrade to Reactor Dysprosium-RELEASE
Closes gh-18276
2019-09-25 09:01:03 +02:00
Stephane Nicoll
56623bd57b Upgrade to Reactor Californium-SR12
Closes gh-18348
2019-09-25 09:00:13 +02:00
Phillip Webb
323a78c4b9 Add property to migrate deprecated endoint IDs
Allow legacy actuator endpoint IDs that contain dots to be transparently
migrated to the new format. This update will allow Spring Cloud users
to proactively migrate from endpoints such as `hystrix.stream` to
`hystrixstream`.

Closes gh-18148
2019-09-24 19:53:50 -07:00
Madhura Bhave
0a70e33009 Merge branch '2.1.x'
Closes gh-18345
2019-09-24 10:28:54 -07:00
Madhura Bhave
342a0535d7 Explicitly configure SecurityWebFilterChain bean for reactive oauth2 client
This will ensure that ReactiveManagementWebSecurityAutoConfiguration backs
off and that the actuator endpoints are also secured via OAuth2.

Fixes gh-17949
2019-09-24 09:50:45 -07:00
Andy Wilkinson
a354657ace Merge branch '2.1.x'
Closes gh-18343
2019-09-24 16:17:36 +01:00
Andy Wilkinson
c613418451 Suppress body when handling a no content (204) "error"
Fixes gh-18136
2019-09-24 16:01:18 +01:00
Andy Wilkinson
4ab53dc8ce Fix broken and redirected links in the reference documentation
Fixes gh-18332
2019-09-24 15:19:04 +01:00
Andy Wilkinson
b483e78f55 Revert "Workaround Spring Data Rest enforcer issue"
This reverts commit 90defac71c.

Closes gh-18335
2019-09-24 12:40:41 +01:00
Andy Wilkinson
35ad5cd011 Fix intermittent failure of inMemoryDerbyIsShutdown 2019-09-24 11:45:50 +01:00
Andy Wilkinson
419f92d381 Tune @ConditionalOnMissingBean for interface-based back off
Previously, a number of usages of @ConditionalOnMissingBean prevented
a bean that implements an auto-configured bean's "main" interface from
causing the auto-configuration of the bean to back off. This would
happen when @ConditionalOnMissingBean did not specify a type, the
@Bean method returned the bean's concrete type, and that concreate
type implements a "main" interface.

This commit updates such usages of @ConditionalOnMissingBean to
specify the "main" interface as the type of the bean that must be
missing. This will allow, for example, the auto-configured
MongoTemplate bean to back off when a MongoOperations bean is defined.

Fixes gh-18101
2019-09-24 11:13:35 +01:00
Brian Clozel
eeaa9bc6c1 Fix ref docs code snippet theme
This commit also fixes a link in the reference documentation.

See gh-18293
2019-09-24 11:25:57 +02:00
dreis2211
d89adfac91 Test compression with invalid content type for all webservers
Closes gh-18338
2019-09-24 10:03:38 +01:00
Andy Wilkinson
3fa9e037fa Merge pull request #18337 from dreis2211
* gh-18337:
  Test compression with invalid content type for all webservers

Closes gh-18337
2019-09-24 09:57:49 +01:00
dreis2211
7bc28fc646 Test compression with invalid content type for all webservers
See gh-18337
2019-09-24 09:57:28 +01:00
Eddú Meléndez
82bf819c49 Add dependency management for io.rest-assured:spring-web-test-client
See gh-18330
2019-09-24 09:46:17 +01:00
Stephane Nicoll
3c8402f6af Polish
See gh-18194
2019-09-24 09:35:39 +02:00
Stephane Nicoll
ddc96c1a62 Merge branch '2.1.x'
Closes gh-18336
2019-09-24 09:19:04 +02:00
leoli
09cf1e6791 Fix property name in "Task Execution and Scheduling" example
See gh-18331
2019-09-24 09:16:17 +02:00
Phillip Webb
d7a472b8a6 Restore HealthIndicatorRegistry beans
Restore `HealthIndicatorRegistry` and `ReactiveHealthIndicatorRegistry`
auto-configured beans with a version that adapts to the new contributor
interfaces.

Closes gh-16903
2019-09-23 23:43:43 -07:00
Phillip Webb
5076d8562a Fix Artemis EmbeddedJMS initialization
Update `ArtemisConnectionFactoryFactory` to reference the new
embedded Artemis classes.

See gh-16646
2019-09-23 23:42:30 -07:00
Phillip Webb
90defac71c Workaround Spring Data Rest enforcer issue
Temporarily update `spring-boot-starter-data-rest` to declare
the correct spring-plugin version.
2019-09-23 23:41:36 -07:00
Andy Wilkinson
42e0dc14b5 Migrate from deprecated Artemis EmbeddedJMS
Closes gh-16646
2019-09-23 18:27:32 +01:00
Brian Clozel
60b1bbb8b2 Polish "Reference Spring Framework RSocket section + polish"
See gh-18321
2019-09-23 18:07:31 +02:00
Rossen Stoyanchev
9a70b5d1f5 Reference Spring Framework RSocket section + polish 2019-09-23 17:51:11 +02:00
Andy Wilkinson
b9cfbf7c8b Merge branch '2.1.x'
Closes gh-18323
2019-09-23 16:46:53 +01:00
Andy Wilkinson
9df356ec4c Fix destination checking in Artemis auto-configuration tests
Closes gh-18319
2019-09-23 16:45:36 +01:00
Stephane Nicoll
98ad5e53ef Start building against Spring Web Services 3.0.8 snapshots
See gh-18316
2019-09-23 15:42:41 +02:00
Stephane Nicoll
ba2c8b333f Start building against Spring HATEOAS 1.0.0 snapshots
See gh-18258
2019-09-23 15:42:41 +02:00
Stephane Nicoll
71e39c7847 Start building against Spring Security 5.2.0 snapshots
See gh-18256
2019-09-23 15:42:41 +02:00
Stephane Nicoll
06f5f73362 Start building against Spring Kafka 2.3.0 snapshots
See gh-18255
2019-09-23 15:42:41 +02:00
Stephane Nicoll
c2df1afff0 Start building against Spring Integration 5.2.0 snapshots
See gh-18254
2019-09-23 15:42:41 +02:00
Stephane Nicoll
c8dc76c5bf Start building against Spring Data Moore snapshots
See gh-18253
2019-09-23 15:42:41 +02:00
Stephane Nicoll
8d131c4fcd Start building against Spring Batch 4.2.0 snapshots
See gh-18252
2019-09-23 15:42:41 +02:00
Stephane Nicoll
e70da5edb0 Start building against Spring AMQP 2.2.0 snapshots
See gh-18251
2019-09-23 15:42:41 +02:00
Andy Wilkinson
f027139743 Upgrade to Commons Compress 1.19
Closes gh-18311
2019-09-23 14:18:01 +01:00
Andy Wilkinson
5cd7c727d4 Drop dependency management for Spring Plugin
Closes gh-18318
2019-09-23 14:11:03 +01:00
Andy Wilkinson
79d8089cd0 Remove redundant spring-plugin-core dependencies
Closes gh-18317
2019-09-23 14:11:03 +01:00
Stephane Nicoll
7533bfd0d3 Start building against Spring Web Services 3.0.8 snapshots
See gh-18315
2019-09-23 13:57:31 +02:00
Stephane Nicoll
f6589e66c2 Start building against Spring Kafka 2.2.9 snapshots
See gh-18314
2019-09-23 13:56:26 +02:00
Stephane Nicoll
d38d3ea940 Start building against Spring Integration 5.1.8 snapshots
See gh-18313
2019-09-23 13:55:14 +02:00
Stephane Nicoll
05f857d1f1 Start building against Spring AMQP 2.1.11 snapshots
See gh-18312
2019-09-23 13:53:54 +02:00