Commit Graph

16233 Commits

Author SHA1 Message Date
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 9c7612e681 Fix NPE in WaitStrategy used for test containers 2018-04-12 10:30:36 -07:00
Madhura Bhave 3f34f25d10 Use the right image 2018-04-12 10:10:04 -07:00
Madhura Bhave eaa8faae09 Apply email notification config to jdk9 & 10 builds
See gh-10790
2018-04-12 09:46:03 -07:00
Brian Clozel b7695fabab Switch to Reactor Bismuth SNAPSHOTs 2018-04-12 18:01:33 +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 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
Brian Clozel 77be10e7bc Fix "status" metrics tag for error responses
Prior to this commit, the metrics `WebFilter` would handle exceptions
flowing through the pipeline and extract tag information right away.
Since error handling turns the exception information into error HTTP
responses later in the chain, the information extracted from the
response earlier is invalid.
In this case, the "status" information could be "200" whereas error
handlers would later set that status to "500".

This commit delays the tags extraction later in the process, right
before the response is comitted. The happy path is not changed, as
handlers signal that the response is fully taken care of at that point.

Fixes gh-11514
2018-04-12 11:30:43 +02:00
Stephane Nicoll 68c6860d88 Merge pull request #12842 from origoni:document-fix-typo-constructor-name
* pr/12842:
  Fix WebClient example constructor name
2018-04-12 09:44:39 +02:00
DK Lee 1f91ae541f Fix WebClient example constructor name
Closes gh-12842
2018-04-12 09:44:03 +02:00
Madhura Bhave 62a8f60bb3 Second attempt at fixing email notification script 2018-04-11 19:34:44 -07:00
Madhura Bhave 68a9aa56f0 Fix determine email body script 2018-04-11 18:09:08 -07:00
Madhura Bhave 8d4e5cbfb7 No need to create output directory 2018-04-11 14:13:11 -07:00
Madhura Bhave ee8188a19c Send email if build is successful after failure
See gh-10790
2018-04-11 13:41:52 -07:00
Madhura Bhave 4fab679829 Upgrade testcontainers to 1.7.0
Closes gh-12821
2018-04-11 10:40:54 -07:00
Stephane Nicoll f55753c1dc Add reference to Axon Framework 2018-04-11 17:43:33 +02:00
Stephane Nicoll 5cba7400e1 Add reference to Flowable 2018-04-11 11:53:33 +02:00
Stephane Nicoll 3c169b4e0a Fix bean name of EnvironmentEndpointWebExtension
Closes gh-12827
2018-04-11 11:34:44 +02:00
Stephane Nicoll 8d81bcd101 Merge pull request #12825 from thsnoopy:fix-typo
* pr/12825:
  Fix typo
2018-04-11 10:51:53 +02:00
Ken Kwon 16ad34aa19 Fix typo
Closes gh-12825
2018-04-11 10:51:20 +02:00
Madhura Bhave a09a6f223b Reinstate commit status for concourse builds
Fixes gh-10851
2018-04-10 11:59:17 -07:00
Stephane Nicoll e8fac7d9c4 Properly discover endpoints that are proxied
Previously to this commit, if a `@ControllerEndpoint`,
`@RestControllerEndpoint` or `@ServletEndpoint` annotated bean was
proxied, the endpoint wasn't properly detected.

This commit makes sure that annotation retrieval works on the user class
while preserving the get (vs. find) retrieval semantic

Closes gh-12441
2018-04-10 20:23:55 +02:00
Stephane Nicoll 86b96254a1 Migrate to ApplicationContextRunner 2018-04-10 20:23:54 +02:00
Andy Wilkinson d8b2a17e1c Reinstate CI image builds for 2.0.x pipeline 2018-04-10 16:47:42 +01:00
Stephane Nicoll 729f07907f Merge pull request #12812 from izeye:polish-20180410
* pr/12812:
  Polish contribution
  Polish
2018-04-10 11:46:45 +02:00
Stephane Nicoll f83934e192 Polish contribution
Closes gh-12812
2018-04-10 11:46:16 +02:00
Johnny Lim f03849d502 Polish
See gh-12812
2018-04-10 11:46:16 +02:00
Andy Wilkinson a9020df9b9 Remove pull request and CI image builds from 2.0.x pipeline 2018-04-10 09:53:15 +01:00
Andy Wilkinson a50ef54e3b Create 2.0.x branch and CI pipeline 2018-04-10 09:42:30 +01:00
Andy Wilkinson 4fbe0b1283 Add dependency management for Kafka
Closes gh-12815
2018-04-10 09:07:19 +01:00
Phillip Webb 8c4080b914 Merge branch '1.5.x' 2018-04-09 18:21:11 -07:00
Phillip Webb 370915f8f0 Fixup version numbers following release 2018-04-09 18:20:41 -07:00
Spring Buildmaster c10aad165f Next Development Version 2018-04-09 23:14:33 +00:00
Phillip Webb ba85cefce3 Polish 2018-04-09 14:50:03 -07:00
Stephane Nicoll d89048300a Merge branch '1.5.x' 2018-04-09 19:59:21 +02:00
Stephane Nicoll ba5ed5b97c Upgrade to Spring Framework 4.3.16
Closes gh-12806
2018-04-09 19:43:31 +02:00
Andy Wilkinson 8d5b9f37d5 Merge branch '1.5.x' 2018-04-09 17:59:53 +01:00
Andy Wilkinson cd0e4fe945 Sanitize sun.java.command by default
Closes gh-12796
2018-04-09 17:44:51 +01:00
Andy Wilkinson 8b1a101cb6 Merge branch '1.5.x' 2018-04-09 17:39:26 +01:00
Andy Wilkinson a06de4d997 Stop error page filter from commiting response prematurely
Previously, the error page filter used sendError to set the response
status when handling an exception and before forwarding the request
to the error controller. Following the fix for gh-11814, this meant
that the error controller was unable to write its response and the
containers default error page was returned instead.

This commit updates the error page filter to use setStatus rather than
sendError. This ensures that the response has the correct status code
while allowing the error controller to write its body. Tests have
been added to the Tomcat deployment test suite to verify that the
error page filter behaves as intended when dealing with a sent error
and an exception for requests accepting HTML, JSON, or anything.

Closes gh-12787
2018-04-09 16:14:27 +01:00
Stephane Nicoll 1454bce725 Merge pull request #12655 from diamondblack:update-couchbase-deprecated-endpoint
* pr/12655:
  Polish "Replace Couchbase's deprecated methods"
  Replace Couchbase's deprecated methods
2018-04-09 16:19:41 +02:00
Stephane Nicoll 6692301d51 Polish "Replace Couchbase's deprecated methods"
Closes gh-12655
2018-04-09 16:17:46 +02:00
Yulin Qin 3236306e53 Replace Couchbase's deprecated methods
See gh-12655
2018-04-09 13:22:22 +02:00
Stephane Nicoll 92d9479765 Gracefully handle exclusion of DataSourceAutoConfiguration
This commit makes sure that an auto-configuration that requires
`DataSourceProperties` will not break if `DataSourceAutoConfiguration`
has been explicitly excluded.

Closes gh-12512
2018-04-09 10:34:23 +02:00
Madhura Bhave 2f5ab50367 Add @QuartzDataSource for quartz auto-configuration
Closes gh-12755
2018-04-05 16:49:04 -07:00
Spring Buildmaster 5587eac8de Next development version (v2.0.2.BUILD-SNAPSHOT) 2018-04-05 12:27:03 +00:00
Andy Wilkinson c3bf8541d7 Do not rely on findAvailableTcpPort finding an available port
Closes gh-12779
2018-04-05 11:35:58 +01:00
Stephane Nicoll c0af8666c3 Merge branch '1.5.x' 2018-04-05 11:23:34 +02:00
Stephane Nicoll 3634a1d9d1 Fixup version numbers following release 2018-04-05 11:23:15 +02:00