Commit Graph

6540 Commits

Author SHA1 Message Date
Stephane Nicoll 52bcdac7b0 Polish 2019-08-23 13:44:24 +02:00
LiangYong 12bfca56d6 Remove unnecessary null check
See gh-17916
2019-08-23 13:25:11 +02:00
Gang Zhang 2b29bea55c Use putIfAbsent() instead of containsKey
See gh-17913
2019-08-23 13:21:23 +02:00
Andy Wilkinson bac63cf79e Merge branch '2.1.x'
Closes gh-17943
2019-08-23 11:29:24 +01:00
Andy Wilkinson 0fb0eb6e5b Deprecate jackson.version in favour of new jackson-bom.version
The versions of Jackon's bom and the versions of Jackson are often
not the same. For example, at the time of writing, the latest bom
version is 2.9.9.20190807 but the latest version of Jackson's core
is 2.9.9 and the latest version of Jackson's databind is 2.9.9.3.

spring-boot-dependencies using a property, jackson.version, to control
the version of jackson-bom that is imported. To make it clear that the
version property controls the version of Jackson's bom and not of
Jackson itself, this commit deprecates jackson.version in favour of
a new jackson-bom.version property.

An additional benefit of this change is that it addresses a problem
when using Gradle and the dependency management plugin. Jackson's bom
uses a jackson.version property to control the version
of core Jackson modules. This names clashes with the name of the
property used by spring-boot-dependencies. Specifying a custom
jackson.version to control the version of the bom that is imported
would also have the unwanted side-effect of customizing the version of
the core Jackson modules declared in Jackson's bom.

Fixes gh-17808
2019-08-23 11:28:20 +01:00
Andy Wilkinson c48228f645 Merge branch '2.1.x'
Closes gh-17942
2019-08-23 11:03:43 +01:00
Andy Wilkinson ac0a22d603 Tolerate LCEMFB with null JpaVendorAdapter in JPA auto-config
Closes gh-17935
2019-08-23 10:39:40 +01:00
Phillip Webb cb5ca7997b Polish 2019-08-22 15:17:34 -07:00
Phillip Webb 6270f5008d Polish lenient enum converter
See gh-17798
2019-08-22 14:42:07 -07:00
Andy Wilkinson b43827d626 Configure ping (formerly application) health indicator by default
This commit renames ApplicationHealthIndicator to PingHealthIndicator
and changes the auto-configuration so that it is now always configured
by default.

Closes gh-17926
2019-08-22 14:50:10 +01:00
Andy Wilkinson 05e089601e Remove default favicon and support for serving from classpath root
Closes gh-17925
2019-08-22 13:53:13 +01:00
Phillip Webb e03f822c6d Add support for health indicator groups
Update the `HealthEndpoint` to support health groups. The
`HealthEndpointSettings` interface has been replaced with
`HealthEndpointGroups` which provides access to the primary group
as well as an optional set of additional groups.

Groups can be configured via properties and may have custom
`StatusAggregator` and `HttpCodeStatusMapper` settings.

Closes gh-14022

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-08-21 18:43:25 -07:00
Phillip Webb f09e0264d9 Migrate HealthIndicator auto-configurations
Migrate all `HealthIndicator` configuration to `HealthContributor`
configurations instead.

See gh-14022
2019-08-21 18:43:25 -07:00
Phillip Webb 3c535e0de3 Add HealthContributor and refactor HealthEndpoint
Overhaul `HealthEndpoint` support to make it easier to support health
groups. Prior to this commit the `HealthIndicator` interface was used
for both regular indicators and composite indicators. In addition the
`Health` result was used to both represent individual, system and
composite health. This design unfortunately means that all health
contributors need to be aware of the `HealthAggregator` and could not
easily support heath groups if per-group aggregation is required.

This commit reworks many aspects of the health support in order to
provide a cleaner separation between a `HealthIndicator`and a
composite. The following changes have been made:

- A `HealthContributor` interface has been introduced to represent
  the general concept of something that contributes health information.
  A contributor can either be a `HealthIndicator` or a
  `CompositeHealthContributor`.

- A `HealthComponent` class has been introduced to mirror the
  contributor arrangement. The component can be either
  `CompositeHealth` or `Health`.

- The `HealthAggregator` interface has been replaced with a more
  focused `StatusAggregator` interface which only deals with `Status`
  results.

- `CompositeHealthIndicator` has been replaced with
  `CompositeHealthContributor` which only provides access to other
  contributors. A composite can no longer directly return `Health`.

- `HealthIndicatorRegistry` has been replaced with
  `HealthContributorRegistry` and the default implementation now
  uses a copy-on-write strategy.

- `HealthEndpoint`, `HealthEndpointWebExtension` and
  `ReactiveHealthEndpointWebExtension` now extend a common
  `HealthEndpointSupport` class. They are now driven by a
  health contributor registry and `HealthEndpointSettings`.

- The `HealthStatusHttpMapper` class has been replaced by a
  `HttpCodeStatusMapper` interface.

- The `HealthWebEndpointResponseMapper` class has been replaced
  by a `HealthEndpointSettings` strategy. This allows us to move
  role related logic and `ShowDetails` to the auto-configure module.

- `SimpleHttpCodeStatusMapper` and `SimpleStatusAggregator`
  implementations have been added which are configured via constructor
  arguments rather than setters.

- Endpoint auto-configuration has been reworked and the
  `CompositeHealthIndicatorConfiguration` class has been replaced
  by `CompositeHealthContributorConfiguration`.

- The endpoint JSON has been changed make `details` distinct from
  `components`.

See gh-17926
2019-08-21 18:43:25 -07:00
Andy Wilkinson 24b5b0d93e Polish 2019-08-21 15:50:33 +01:00
Andy Wilkinson 87339405f3 Merge branch '2.1.x'
Closes gh-17928
2019-08-21 15:18:13 +01:00
Andy Wilkinson abe3d38527 Fix OoM error when starting Tomcat with max int load on startup
Fixes gh-17927
2019-08-21 15:17:54 +01:00
dreis2211 6ef6875a60 Correct WebFlux response body method
See gh-17919
2019-08-21 11:07:48 +01:00
Andy Wilkinson 9ac6485768 Prioritise static resource locations over classpath for favicon.ico
Closes gh-17922
2019-08-21 10:42:32 +01:00
Madhura Bhave 55c6ee71c1 Include logger group with configuredLevel in docs
Closes gh-17772
2019-08-20 22:48:26 -07:00
Phillip Webb 5f88c592b3 Polish 2019-08-20 19:27:43 -07:00
Brian Clozel e7c3ab3e27 Rename WebFlux response body methods
This commit adapts to recent changes in Spring Framework.
See spring-projects/spring-framework#23212
2019-08-20 13:03:24 +02:00
Stephane Nicoll 752bb0f5ab Start building against Spring Kafka 2.3.0 snapshots
See gh-17902
2019-08-20 10:46:00 +02:00
Stephane Nicoll 9dd6edbe56 Start building against Spring Integration 5.2.0 snapshots
See gh-17901
2019-08-20 10:45:20 +02:00
Stephane Nicoll b2e024f22e Start building against Spring HATEOAS 1.0.0 snapshots
See gh-17904
2019-08-20 10:44:32 +02:00
Stephane Nicoll e984874e96 Start building against Spring Data Moore snapshots
See gh-17900
2019-08-20 10:44:32 +02:00
Stephane Nicoll 3c0a41646b Start building against Spring Batch 4.2.0 snapshots
See gh-17899
2019-08-20 10:44:27 +02:00
Stephane Nicoll 4b6e3b2a59 Start building against Reactor Dysprosium snapshots
See gh-17895
2019-08-20 10:01:31 +02:00
Andy Wilkinson e805b6ea6e Upgrade to Mockito 3.0.0
Closes gh-17803
2019-08-19 18:25:07 +01:00
Andy Wilkinson 7f8944d00f Polish 2019-08-19 17:31:56 +01:00
Andy Wilkinson cc3df98135 Merge branch '2.1.x' 2019-08-19 16:08:25 +01:00
Andy Wilkinson ab87b2a39b Polish 2019-08-19 16:05:43 +01:00
Andy Wilkinson f916e1a1ce Document response structure for retrieving a logger group
Closes gh-17909
2019-08-19 14:18:41 +01:00
Stephane Nicoll 3bc65f4fec Upgrade to Kotlin coroutines 1.3.0-RC2
See gh-17907
2019-08-19 11:30:08 +02:00
Stephane Nicoll a43e4c7a21 Start building against Spring Framework 5.2.0 snapshots
See gh-17896
2019-08-19 11:27:22 +02:00
Stephane Nicoll 7f06504006 Detect ConfigurationProperties using autowiring constructor
This commit improves InvalidConfigurationPropertiesException failure
analysis by adding a dedicated description when a single autowiring
constructor is found. When @Component is removed, such constructor is
used for properties binding and will not apply the same semantics as
before.

Closes gh-17750
2019-08-19 11:01:49 +02:00
LiangYong a5746d0a03 Simplify some code
See gh-17893
2019-08-19 07:24:54 +02:00
thelproad 9c1f503e46 Simplify if statements
See gh-17884
2019-08-17 06:50:32 +02:00
Stephane Nicoll fc0cee5ea7 Merge branch '2.1.x' 2019-08-17 06:47:33 +02:00
lijuny d33ed84f1f Remove redundant code
See gh-17875
2019-08-17 06:41:10 +02:00
dreis2211 d4affd7f85 Use hasSize() assertion in favor of length checks
See gh-17874
2019-08-17 06:39:41 +02:00
Stephane Nicoll 04b63cda8f Merge branch '2.1.x'
Closes gh-17889
2019-08-17 06:38:00 +02:00
Filip Hrisafov 1ebbe9fc55 Map non-null LDAP properties
The userDn and password in LdapContextSource are not nullable. The
default values for userDn and password in LdapProperties are null. When
the values are set to null there will eventually be a
NullPointerException during
AbstractContextSource#setupAuthenticatedEnvironment since HashTable
doesn't allow null for values.

See gh-17861
2019-08-17 06:34:22 +02:00
Madhura Bhave 76dfe1aae4 Merge branch '2.1.x'
Closes gh-17887
2019-08-16 16:53:42 -07:00
Madhura Bhave 0187e5106d Polish "Set up SpringLiquibase beans' dependencies by type rather than name"
See gh-17805
2019-08-16 16:43:50 -07:00
Andrii Hrytsiuk b69f9e9fdf Add missing javadoc
See gh-17805
2019-08-16 16:05:33 -07:00
Andrii Hrytsiuk eaad22dd89 Set up SpringLiquibase beans' dependencies by type rather than name
See gh-17805
2019-08-16 16:05:33 -07:00
Madhura Bhave dab815af40 Simplify mockmvc security in tests following upstream changes
SecurityMockMvcConfigurer now honors filter order so we can use that instead
of manually adding the filter.
2019-08-16 10:51:57 -07:00
Andy Wilkinson a785a5b58a Test the Gradle Plugin against Gradle 5.6
Closes gh-17883
2019-08-16 08:46:48 +01:00
dreis2211 56940fca97 Test the Gradle Plugin against Gradle 5.6
See gh-17876
2019-08-16 08:45:33 +01:00
Madhura Bhave 64e8b1d47c Polish "Add properties for Jetty threadpool"
See gh-17871
2019-08-15 18:31:12 -07:00
HaiTao Zhang 1024d74742 Add properties for Jetty threadpool
See gh-17871
2019-08-15 18:30:57 -07:00
Madhura Bhave 09b690b3c9 Fix tests 2019-08-15 17:53:19 -07:00
Madhura Bhave 7494a2baad Merge branch '2.1.x'
Closes gh-17880
2019-08-15 15:15:50 -07:00
Madhura Bhave 8d7deb7b67 Polish "Expand documentation on remote devtools"
See gh-17780
2019-08-15 15:11:10 -07:00
Sergei Petunin ab33bc7deb Expand documentation on remote devtools
See gh-17780
2019-08-15 15:09:43 -07:00
Madhura Bhave eea83e935e Resolve httpstatus error series using raw int code
See gh-16691
2019-08-15 10:44:46 -07:00
Madhura Bhave 186530478c Bypass Spring security authentication for remote devtools endpoint
Closes gh-17878
2019-08-15 10:34:53 -07:00
Madhura Bhave 4b4dc28a86 Support non-standard error codes with AbstractErrorWebExceptionHandler
Fixes gh-16691
2019-08-15 08:21:04 -07:00
lijuny 64344214e1 Delete redundant variables
See gh-17864
2019-08-15 07:05:10 +02:00
Andy Wilkinson ba4c5be2fd Remove unused field
See gh-17562
2019-08-14 19:41:14 +01:00
Stephane Nicoll 6f28f41774 Polish "Simplify some code"
See gh-17860
2019-08-14 08:55:20 +02:00
jason 4bb842343a Simplify some code
See gh-17860
2019-08-14 08:53:02 +02:00
lijuny b26f887a2e Simplify some code
See gh-17852
2019-08-14 08:48:16 +02:00
lijuny 200de49c11 Replace Collection#addAll to call constructor
See gh-17847
2019-08-14 08:42:13 +02:00
周武栋 6fab5b591b Simplify some code
See gh-17837
2019-08-14 08:36:17 +02:00
Madhura Bhave 468b2e6d57 Merge branch '2.1.x'
Closes gh-17857
2019-08-13 15:15:14 -07:00
Madhura Bhave 3515ec1f29 Support relaxed binding for properties before environment is prepared
Fixes gh-17843
2019-08-13 14:54:27 -07:00
Stephane Nicoll 704992e657 Merge branch '2.1.x'
Closes gh-17855
2019-08-13 17:36:14 +02:00
Stephane Nicoll fcf4680626 Polish "Document how to add metadata for collection and enum default values"
Closes gh-12874
2019-08-13 17:35:37 +02:00
Stephane Nicoll ccf9b1b934 Merge branch '2.1.x'
Closes gh-17854
2019-08-13 17:23:07 +02:00
Stephane Nicoll 7aea432e3e Promote dependency management plugin version to the bom
Closes gh-17842
2019-08-13 17:21:32 +02:00
Stephane Nicoll 463f94930c Merge branch '2.1.x'
Closes gh-17850
2019-08-13 09:22:05 +02:00
Stephane Nicoll 25aecfeb35 Upgrade to Jackson 2.9.9.20190807
Closes gh-17698
2019-08-13 09:21:14 +02:00
Madhura Bhave 178746d678 Update Opaque Token Client Name following upstream changes
Closes gh-17846
2019-08-12 18:38:27 -07:00
Madhura Bhave c178c9dd47 Merge branch '2.1.x' 2019-08-12 17:30:47 -07:00
Madhura Bhave 38d36ab18d Document how to add metadata for collection and enum default values
Closes gh-12874
2019-08-12 17:26:39 -07:00
Brian Clozel 16f798dc11 Apply RSocket transport configuration on server
Fixes gh-17845
2019-08-12 21:11:59 +02:00
Stephane Nicoll 2059147421 Merge branch '2.1.x'
Closes gh-17840
2019-08-12 11:04:56 +02:00
Stephane Nicoll 56c2a52ea4 Polish "Fix syntax errors in docs"
Closes gh-17835
2019-08-12 10:54:33 +02:00
Stephane Nicoll d02000ecc0 Merge branch '2.1.x'
Closes gh-17840
2019-08-12 10:36:06 +02:00
dreis2211 2e32af4737 Fix syntax errors in docs
See gh-17835
2019-08-12 10:34:46 +02:00
lijuny d8baefc38a Simplify some code
See gh-17834
2019-08-12 10:31:06 +02:00
dreis2211 b605cddb10 Polish some Collections API calls
See gh-17825
2019-08-11 10:36:10 +02:00
zhuzhuman 84eacc49ed Simplify for statement with Collection copy
See gh-17827
2019-08-11 10:34:11 +02:00
lijuny 844a8d8027 Simplify some code
See gh-17832
2019-08-11 10:05:36 +02:00
Madhura Bhave 835108e522 Support binding of YAML style true/false values to 'ON'/'OFF'.
Fixes gh-17798
2019-08-09 16:19:15 -07:00
Stephane Nicoll 4928e958ce Add reference to Pebble Templates to 3rd party starter list
Closes gh-17822
2019-08-09 09:28:23 +02:00
Stephane Nicoll bf88149fb9 Upgrade to Couchbase Client 2.7.9
Closes gh-17795
2019-08-09 09:16:59 +02:00
Madhura Bhave 4208be0154 Merge branch '2.1.x'
Closes gh-17818
2019-08-08 16:26:53 -07:00
Madhura Bhave 47a9bb1c0e Document that auto-configuration classes are not public API
Closes gh-16704
2019-08-08 16:26:04 -07:00
Madhura Bhave 7997971b0e Merge branch '2.1.x'
Closes gh-17815
2019-08-08 15:16:20 -07:00
Madhura Bhave 1b62a05c40 Document Prometheus Pushgateway support
Closes gh-16853
2019-08-08 15:15:51 -07:00
Madhura Bhave 8a9c60a29a Merge branch '2.1.x' 2019-08-08 11:52:50 -07:00
Madhura Bhave 541d3c4853 Fix typo 2019-08-08 11:52:05 -07:00
Stephane Nicoll 07cd67a3fe Tolerate null startTime
This commit prevents a potential NPE if the startTime of the
MavenSession is not available and fallbacks to the current time. This
can happen when invoking the plugin with Maven embedded in an IDE.

Closes gh-17810
2019-08-08 17:32:04 +02:00
Stephane Nicoll b8a1043e98 Merge branch '2.1.x'
Closes gh-17813
2019-08-08 16:33:31 +02:00
Stephane Nicoll 1b3a6d1616 Polish "Configure a temporary directory with Undertow"
See gh-17778
2019-08-08 16:29:43 +02:00
Andy Chen 0388f954af Configure a temporary directory with Undertow
See gh-17778
2019-08-08 16:17:34 +02:00
Stephane Nicoll 1c8f727864 Polish "Simplify if statements"
See gh-17785
2019-08-08 14:35:29 +02:00