Commit Graph

6591 Commits (64adcaa28535a45ec8dea5362951f609cbd472ae)

Author SHA1 Message Date
Andy Wilkinson 2d2e3b3d8b Support parallel test execution with @AutoConfigureMockMvc
Previously, the deferred line writing that is used, to print MockMvc
results to the console assumed that each DeferredLinesWriter would
only be used by a single thread at a time. This assumption does not
hold true when using JUnit 5's parallel test exection if the tests
running in parallel share an application context. This resulted in
a concurrent modification exception if one thread was adding lines
to the output while another was iterating over them.

This commit updates DeferredLinesWriter so that it uses thread local
storage for the deferred lines. This ensures that each List of lines
is only ever accessed by a single thread.

Closes gh-16179
5 years ago
Stephane Nicoll 52bcdac7b0 Polish 5 years ago
LiangYong 12bfca56d6 Remove unnecessary null check
See gh-17916
5 years ago
Gang Zhang 2b29bea55c Use putIfAbsent() instead of containsKey
See gh-17913
5 years ago
Andy Wilkinson bac63cf79e Merge branch '2.1.x'
Closes gh-17943
5 years ago
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
5 years ago
Andy Wilkinson c48228f645 Merge branch '2.1.x'
Closes gh-17942
5 years ago
Andy Wilkinson ac0a22d603 Tolerate LCEMFB with null JpaVendorAdapter in JPA auto-config
Closes gh-17935
5 years ago
Phillip Webb cb5ca7997b Polish 5 years ago
Phillip Webb 6270f5008d Polish lenient enum converter
See gh-17798
5 years ago
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
5 years ago
Andy Wilkinson 05e089601e Remove default favicon and support for serving from classpath root
Closes gh-17925
5 years ago
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>
5 years ago
Phillip Webb f09e0264d9 Migrate HealthIndicator auto-configurations
Migrate all `HealthIndicator` configuration to `HealthContributor`
configurations instead.

See gh-14022
5 years ago
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
5 years ago
Andy Wilkinson 24b5b0d93e Polish 5 years ago
Andy Wilkinson 87339405f3 Merge branch '2.1.x'
Closes gh-17928
5 years ago
Andy Wilkinson abe3d38527 Fix OoM error when starting Tomcat with max int load on startup
Fixes gh-17927
5 years ago
dreis2211 6ef6875a60 Correct WebFlux response body method
See gh-17919
5 years ago
Andy Wilkinson 9ac6485768 Prioritise static resource locations over classpath for favicon.ico
Closes gh-17922
5 years ago
Madhura Bhave 55c6ee71c1 Include logger group with configuredLevel in docs
Closes gh-17772
5 years ago
Phillip Webb 5f88c592b3 Polish 5 years ago
Brian Clozel e7c3ab3e27 Rename WebFlux response body methods
This commit adapts to recent changes in Spring Framework.
See spring-projects/spring-framework#23212
5 years ago
Stephane Nicoll 752bb0f5ab Start building against Spring Kafka 2.3.0 snapshots
See gh-17902
5 years ago
Stephane Nicoll 9dd6edbe56 Start building against Spring Integration 5.2.0 snapshots
See gh-17901
5 years ago
Stephane Nicoll b2e024f22e Start building against Spring HATEOAS 1.0.0 snapshots
See gh-17904
5 years ago
Stephane Nicoll e984874e96 Start building against Spring Data Moore snapshots
See gh-17900
5 years ago
Stephane Nicoll 3c0a41646b Start building against Spring Batch 4.2.0 snapshots
See gh-17899
5 years ago
Stephane Nicoll 4b6e3b2a59 Start building against Reactor Dysprosium snapshots
See gh-17895
5 years ago
Andy Wilkinson e805b6ea6e Upgrade to Mockito 3.0.0
Closes gh-17803
5 years ago
Andy Wilkinson 7f8944d00f Polish 5 years ago
Andy Wilkinson cc3df98135 Merge branch '2.1.x' 5 years ago
Andy Wilkinson ab87b2a39b Polish 5 years ago
Andy Wilkinson f916e1a1ce Document response structure for retrieving a logger group
Closes gh-17909
5 years ago
Stephane Nicoll 3bc65f4fec Upgrade to Kotlin coroutines 1.3.0-RC2
See gh-17907
5 years ago
Stephane Nicoll a43e4c7a21 Start building against Spring Framework 5.2.0 snapshots
See gh-17896
5 years ago
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
5 years ago
LiangYong a5746d0a03 Simplify some code
See gh-17893
5 years ago
thelproad 9c1f503e46 Simplify if statements
See gh-17884
5 years ago
Stephane Nicoll fc0cee5ea7 Merge branch '2.1.x' 5 years ago
lijuny d33ed84f1f Remove redundant code
See gh-17875
5 years ago
dreis2211 d4affd7f85 Use hasSize() assertion in favor of length checks
See gh-17874
5 years ago
Stephane Nicoll 04b63cda8f Merge branch '2.1.x'
Closes gh-17889
5 years ago
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
5 years ago
Madhura Bhave 76dfe1aae4 Merge branch '2.1.x'
Closes gh-17887
5 years ago
Madhura Bhave 0187e5106d Polish "Set up SpringLiquibase beans' dependencies by type rather than name"
See gh-17805
5 years ago
Andrii Hrytsiuk b69f9e9fdf Add missing javadoc
See gh-17805
5 years ago
Andrii Hrytsiuk eaad22dd89 Set up SpringLiquibase beans' dependencies by type rather than name
See gh-17805
5 years ago
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.
5 years ago
Andy Wilkinson a785a5b58a Test the Gradle Plugin against Gradle 5.6
Closes gh-17883
5 years ago
dreis2211 56940fca97 Test the Gradle Plugin against Gradle 5.6
See gh-17876
5 years ago
Madhura Bhave 64e8b1d47c Polish "Add properties for Jetty threadpool"
See gh-17871
5 years ago
HaiTao Zhang 1024d74742 Add properties for Jetty threadpool
See gh-17871
5 years ago
Madhura Bhave 09b690b3c9 Fix tests 5 years ago
Madhura Bhave 7494a2baad Merge branch '2.1.x'
Closes gh-17880
5 years ago
Madhura Bhave 8d7deb7b67 Polish "Expand documentation on remote devtools"
See gh-17780
5 years ago
Sergei Petunin ab33bc7deb Expand documentation on remote devtools
See gh-17780
5 years ago
Madhura Bhave eea83e935e Resolve httpstatus error series using raw int code
See gh-16691
5 years ago
Madhura Bhave 186530478c Bypass Spring security authentication for remote devtools endpoint
Closes gh-17878
5 years ago
Madhura Bhave 4b4dc28a86 Support non-standard error codes with AbstractErrorWebExceptionHandler
Fixes gh-16691
5 years ago
lijuny 64344214e1 Delete redundant variables
See gh-17864
5 years ago
Andy Wilkinson ba4c5be2fd Remove unused field
See gh-17562
5 years ago
Stephane Nicoll 6f28f41774 Polish "Simplify some code"
See gh-17860
5 years ago
jason 4bb842343a Simplify some code
See gh-17860
5 years ago
lijuny b26f887a2e Simplify some code
See gh-17852
5 years ago
lijuny 200de49c11 Replace Collection#addAll to call constructor
See gh-17847
5 years ago
周武栋 6fab5b591b Simplify some code
See gh-17837
5 years ago
Madhura Bhave 468b2e6d57 Merge branch '2.1.x'
Closes gh-17857
5 years ago
Madhura Bhave 3515ec1f29 Support relaxed binding for properties before environment is prepared
Fixes gh-17843
5 years ago
Stephane Nicoll 704992e657 Merge branch '2.1.x'
Closes gh-17855
5 years ago
Stephane Nicoll fcf4680626 Polish "Document how to add metadata for collection and enum default values"
Closes gh-12874
5 years ago
Stephane Nicoll ccf9b1b934 Merge branch '2.1.x'
Closes gh-17854
5 years ago
Stephane Nicoll 7aea432e3e Promote dependency management plugin version to the bom
Closes gh-17842
5 years ago
Stephane Nicoll 463f94930c Merge branch '2.1.x'
Closes gh-17850
5 years ago
Stephane Nicoll 25aecfeb35 Upgrade to Jackson 2.9.9.20190807
Closes gh-17698
5 years ago
Madhura Bhave 178746d678 Update Opaque Token Client Name following upstream changes
Closes gh-17846
5 years ago
Madhura Bhave c178c9dd47 Merge branch '2.1.x' 5 years ago
Madhura Bhave 38d36ab18d Document how to add metadata for collection and enum default values
Closes gh-12874
5 years ago
Brian Clozel 16f798dc11 Apply RSocket transport configuration on server
Fixes gh-17845
5 years ago
Stephane Nicoll 2059147421 Merge branch '2.1.x'
Closes gh-17840
5 years ago
Stephane Nicoll 56c2a52ea4 Polish "Fix syntax errors in docs"
Closes gh-17835
5 years ago
Stephane Nicoll d02000ecc0 Merge branch '2.1.x'
Closes gh-17840
5 years ago
dreis2211 2e32af4737 Fix syntax errors in docs
See gh-17835
5 years ago
lijuny d8baefc38a Simplify some code
See gh-17834
5 years ago
dreis2211 b605cddb10 Polish some Collections API calls
See gh-17825
5 years ago
zhuzhuman 84eacc49ed Simplify for statement with Collection copy
See gh-17827
5 years ago
lijuny 844a8d8027 Simplify some code
See gh-17832
5 years ago
Madhura Bhave 835108e522 Support binding of YAML style true/false values to 'ON'/'OFF'.
Fixes gh-17798
5 years ago
Stephane Nicoll 4928e958ce Add reference to Pebble Templates to 3rd party starter list
Closes gh-17822
5 years ago
Stephane Nicoll bf88149fb9 Upgrade to Couchbase Client 2.7.9
Closes gh-17795
5 years ago
Madhura Bhave 4208be0154 Merge branch '2.1.x'
Closes gh-17818
5 years ago
Madhura Bhave 47a9bb1c0e Document that auto-configuration classes are not public API
Closes gh-16704
5 years ago
Madhura Bhave 7997971b0e Merge branch '2.1.x'
Closes gh-17815
5 years ago
Madhura Bhave 1b62a05c40 Document Prometheus Pushgateway support
Closes gh-16853
5 years ago
Madhura Bhave 8a9c60a29a Merge branch '2.1.x' 5 years ago
Madhura Bhave 541d3c4853 Fix typo 5 years ago
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
5 years ago
Stephane Nicoll b8a1043e98 Merge branch '2.1.x'
Closes gh-17813
5 years ago
Stephane Nicoll 1b3a6d1616 Polish "Configure a temporary directory with Undertow"
See gh-17778
5 years ago
Andy Chen 0388f954af Configure a temporary directory with Undertow
See gh-17778
5 years ago
Stephane Nicoll 1c8f727864 Polish "Simplify if statements"
See gh-17785
5 years ago
SaberXu c6c3a91f8d Simplify if statements
See gh-17785
5 years ago
Vedran Pavic 85a289f71a Harmonize Spring Session flush mode properties javadoc
See gh-17797
5 years ago
Vedran Pavic 84dd1f2d29 Add support for configuring Spring Session JDBC flush mode
See gh-17797
5 years ago
Stephane Nicoll 71cf0a3ec8 Merge branch '2.1.x'
Closes gh-17812
5 years ago
Stephane Nicoll 994f08d234 Polish "Fix annotation lookup on proxied EndpointExtension"
See gh-17807
5 years ago
Jacques-Etienne Beaudet 9083da2876 Fix annotation lookup on proxied EndpointExtension
See gh-17807
5 years ago
Stephane Nicoll 845f2d0607 Upgrade to Rsocket 1.0.0-RC2
Closes gh-17800
5 years ago
Stephane Nicoll b8a8df4118 Revert "Upgrade to Jackson 2.9.9.20190806"
This reverts commit 81239611a0.

See gh-17698
5 years ago
Stephane Nicoll 81239611a0 Upgrade to Jackson 2.9.9.20190806
Closes gh-17698
5 years ago
Stephane Nicoll 94184ae38b Upgrade to Spring Security 5.1.6
Closes gh-17794
5 years ago
Madhura Bhave 3c9774d73c Upgrade to Spring Integration 5.2.0.M4
Closes gh-17584
5 years ago
Madhura Bhave c5d1781ae1 Merge branch '2.1.x'
Closes gh-17793
5 years ago
陈其苗 77931a0981 Fix typo in assertion
See gh-17774
5 years ago
Bo Zhang c19057e117 Simplify conditional statements
See gh-17779
5 years ago
Madhura Bhave 4002a66c8b Upgrade to Spring Session Corn-M3
Closes gh-17348
5 years ago
Stephane Nicoll 602bf730f2 Upgrade to Webjars Locator Core 0.38
Closes gh-17792
5 years ago
Stephane Nicoll 60bb9e695b Upgrade to Mariadb 2.4.3
Closes gh-17791
5 years ago
Stephane Nicoll 9226edf19b Upgrade to Elasticsearch 6.8.2
Closes gh-17790
5 years ago
Stephane Nicoll 5ace0e5e0c Upgrade to Johnzon Jsonb 1.1.13
Closes gh-17789
5 years ago
Stephane Nicoll 6a4fb6fcde Upgrade to Rxjava2 2.2.11
Closes gh-17788
5 years ago
Stephane Nicoll 7874de4062 Restore tests that were failing with Java 13
Closes gh-17607
5 years ago
Stephane Nicoll 9a16a505ec Upgrade to Hazelcast 3.12.2
Closes gh-17787
5 years ago
Madhura Bhave e6dd6a3df8 Upgrade to Spring Security 5.2.0.M4
Closes gh-17349
5 years ago
Stephane Nicoll 7a3a66e43d Upgrade to Spring Kafka 2.3.0.M4
Closes gh-17319
5 years ago
Stephane Nicoll 41e19a8298 Upgrade to Spring AMQP 2.2.0 M4
Closes gh-17583
5 years ago
Stephane Nicoll 766b6c394f Upgrade to Rxjava2 2.2.11
Closes gh-17675
5 years ago
Stephane Nicoll b1d298fdef Upgrade to Johnzon Jsonb 1.1.13
Closes gh-17786
5 years ago
Madhura Bhave 5e52fedbac Upgrade to Spring Session Bean-SR7
Closes gh-17581
5 years ago
Stephane Nicoll 134c534cc1 Upgrade to Spring Kafka 2.2.8
Closes gh-17645
5 years ago
Stephane Nicoll 1e74e294ae Upgrade to Spring AMQP 2.1.8
Closes gh-17641
5 years ago
Stephane Nicoll 236efd2cf4 Upgrade to Spring Integration 5.1.7
Closes gh-17643
5 years ago
Stephane Nicoll 501d9ad628 Upgrade to Spring Data Moore-RC2
Closes gh-17350
5 years ago
Stephane Nicoll aaf953338b Upgrade to Spring HATEOAS 1.0.0.RC1
Closes gh-17755
5 years ago
Stephane Nicoll 854d6081c6 Upgrade to Byte Buddy 1.10.0
Closes gh-17716
5 years ago
Stephane Nicoll 9938c18968 Upgrade to Spring Data Lovelace-SR10
Closes gh-17353
5 years ago
Stephane Nicoll 5529596e17 Upgrade to Spring Framework 5.2.0 RC1
Closes gh-17280
5 years ago
Stephane Nicoll 3e8b599d95 Upgrade to AssertJ 3.13.2
Closes gh-17690
5 years ago
freekry a9e7c4ec95 Fix typo in JsonComponent javadoc
See gh-17776
5 years ago
Stephane Nicoll b15674d71e Upgrade to Spring HATEOAS 0.25.2
Closes gh-17777
5 years ago
Phillip Webb 105df823ee Polish 5 years ago
Phillip Webb 2cdceb92bf Polish 5 years ago
Phillip Webb b29e81fcd9 Allow defaultBindHandler to be specified on Binder
Allow a `defaultBindHandler` to be specified on the `Binder` instance
to save needing to pass it to each `bind` method call.

Closes gh-17773
5 years ago
Phillip Webb fb6568be73 Improve PropertySourceLoader file extension error
Refine the `IllegalStateException` thrown from `PropertySourceLoader`
for unknown extensions to also indicated that folder references must end
in '/'.

Closes gh-17241
5 years ago
Stephane Nicoll 99f30700e2 Upgrade to Spring Batch 4.2.0.M3
Closes gh-17347
5 years ago
Madhura Bhave ea244aa32b Merge branch '2.1.x'
Closes gh-17769
5 years ago
Madhura Bhave faaada1416 Remove liquibase check change log location
Missing change logs would lead to an exception even
if the checkChangeLogLocation was set to false. Spring Boot's check
would pass but Liquibase would fail later making this property redundant.

Fixes gh-16232
5 years ago
Stephane Nicoll f021c227e1 Polish 5 years ago
Stephane Nicoll 45915d085e Merge branch '2.1.x'
Closes gh-17767
5 years ago
Stephane Nicoll eb26492eef Polish 5 years ago