Commit Graph

18971 Commits

Author SHA1 Message Date
Andy Wilkinson e151dbf003 Document Jersey metrics' new outcome tag and polish formatting
See gh-12482
2018-10-14 14:21:37 +01:00
Andy Wilkinson d6de58f257 Merge pull request #14816 from Johnny Lim
* gh-14816:
  Fix copyright end years
2018-10-14 14:13:41 +01:00
Johnny Lim c1ad1f7638 Fix copyright end years
Closes gh-14816
2018-10-14 14:13:19 +01:00
Andy Wilkinson 892a21acea Merge pull request #14657 from Dave Syer
* gh-14657:
  Polish "Use non-reflective APIs to retrieve config prop binding converters"
  Use non-reflective APIs to retrieve config prop binding converters
2018-10-14 14:11:21 +01:00
Andy Wilkinson 83692a22da Polish "Use non-reflective APIs to retrieve config prop binding converters"
Closes gh-14657
2018-10-14 14:09:21 +01:00
Dave Syer 2094e54ef2 Use non-reflective APIs to retrieve config prop binding converters
See gh-14657
2018-10-14 14:09:16 +01:00
Stephane Nicoll a0bbb98b51 Merge branch '2.0.x' 2018-10-14 10:43:52 +02:00
Stephane Nicoll f96d73f3cc Start building against Micrometer 1.0.7 snapshots
See gh-14808
2018-10-14 10:42:59 +02:00
Andy Wilkinson 6e5310900b Switch from thymeleaf-extras-springsecurity4 to extras-springsecurity5
Closes gh-14806
2018-10-13 19:57:04 +01:00
Andy Wilkinson 1ac48ee876 Merge branch '2.0.x' 2018-10-13 16:56:21 +01:00
Andy Wilkinson b78c7aca3e Allow ALPNServerConnectionFactory to negotiate use of HTTP/1.1
Closes gh-14444
2018-10-13 16:56:10 +01:00
Andy Wilkinson 7ad94299d6 Stop relying on server customizer ordering for Tomcat metrics binding
Closes gh-14784
2018-10-13 11:52:51 +01:00
Andy Wilkinson 2b11ee4389 Auto-configure binding of Micrometer's JettyServerThreadPoolMetrics
Closes gh-14591
2018-10-13 11:52:51 +01:00
Stephane Nicoll 6199af6c0f Polish 2018-10-13 11:19:46 +02:00
Madhura Bhave 6df9555d6a Update micrometer tests following upstream changes 2018-10-12 18:58:11 -07:00
Madhura Bhave ec6e9d205a Merge branch '2.0.x' 2018-10-12 18:24:23 -07:00
Madhura Bhave a86ba6495c Polish 2018-10-12 18:21:39 -07:00
Madhura Bhave 8f91bbeffa Polish 2018-10-12 18:14:36 -07:00
Madhura Bhave 24a8461749 Merge branch '2.0.x' 2018-10-12 17:59:43 -07:00
Madhura Bhave d2ceb8f7da Polish 2018-10-12 17:59:01 -07:00
Stephane Nicoll 8f1729e322 Merge branch '2.0.x' 2018-10-12 16:00:08 +02:00
Stephane Nicoll 144ca05cc1 Merge pull request #14744 from mmanciop
* pr/14744:
  Polish "Add support for @ResponseStatus in DefaultErrorAttributes"
  Add support for @ResponseStatus in DefaultErrorAttributes
2018-10-12 15:59:37 +02:00
Stephane Nicoll 798b37805d Polish "Add support for @ResponseStatus in DefaultErrorAttributes"
Closes gh-14744
2018-10-12 15:57:57 +02:00
Michele Mancioppi 17919749db Add support for @ResponseStatus in DefaultErrorAttributes
This commit adds support for @ResponseStatus in DefaultErrorAttributes
mimicking the semantics of @ResponseStatus in SpringMVC.

Throwables annotated with @ResponseStatus handled by
DefaultErrorAttributes will result in the following error attributes:
* 'status' set as the return value of the HttpStatus#value()
  defined as @ResponseStatus#value()
* 'error' set to the default reason phrase of the HttpStatus
  defined as @ResponseStatus#value()
* 'message' defined as the value of @ResponseStatus#reason(),
  or the default HttpStatus's reason phrase if left unspecified

See gh-14744
2018-10-12 15:47:07 +02:00
Stephane Nicoll 7c1ffbda79 Merge pull request #14774 from RoyJacobs
* pr/14774:
  Polish "Allow ClassPathResources to be filtered by FilteredClassLoader"
  Allow ClassPathResources to be filtered by FilteredClassLoader
2018-10-12 15:39:31 +02:00
Stephane Nicoll baf83aec0d Polish "Allow ClassPathResources to be filtered by FilteredClassLoader"
Closes gh-14774
2018-10-12 15:37:25 +02:00
Roy Jacobs d3ca1a7b0e Allow ClassPathResources to be filtered by FilteredClassLoader
See gh-14774
2018-10-12 15:15:16 +02:00
Stephane Nicoll 29c0aa4445 Merge branch '2.0.x' 2018-10-12 14:31:34 +02:00
Stephane Nicoll c0a5e985c2 Upgrade to Thymeleaf 3.0.10.RELEASE
Closes gh-14797
2018-10-12 14:30:42 +02:00
Stephane Nicoll e37145a53c Merge pull request #14139 from alexanderabramov
* pr/14139:
  Polish "Improve Micrometer histogram properties support"
  Improve Micrometer histogram properties support
2018-10-12 14:23:40 +02:00
Stephane Nicoll 0ff1b25f52 Polish "Improve Micrometer histogram properties support"
Closes gh-14139
2018-10-12 14:23:21 +02:00
Alexander Abramov c1c79ab1c2 Improve Micrometer histogram properties support
This commit adds configuration properties for Micrometer histogram
settings: "minimumExpectedValue" and "maximumExpectedValue".

See gh-14139
2018-10-12 14:23:21 +02:00
Brian Clozel 5607fcae85 Record URI pattern tag for WebFlux Fn metrics
This commit records URI tags for Spring WebFlux Fn applications for
`http.server.requests` metrics. This is possible since SPR-17098.

Closes gh-12757
2018-10-12 13:57:32 +02:00
Andy Wilkinson 19232ad87a Merge branch '2.0.x' 2018-10-12 11:25:17 +01:00
Andy Wilkinson 861587ec78 Allow @ConditionalOnEnabledEndpoint to be used on any component
Closes gh-14787
2018-10-12 11:24:33 +01:00
Brian Clozel 2588a71ac4 Auto-Configure HTTP ResourceFactories on servers
This commit auto-configures HTTP resource factories on both Reactor
Netty and Jetty server instances. This creates `ReactorResourceFactory`
and `JettyResourceFactory` beans when necessary - those beans can be
reused and applied by the client auto-configuration in order to share
resources between client and server for optimal performance.

The server auto-configuration has the highest precedence, so from now
on, the auto-configured ResourceFactory bean on the client side will be
skipped if a reactive server is configured.

Closes gh-14495
2018-10-12 11:32:55 +02:00
Stephane Nicoll 11efe92ce7 Polish "Configure Cassandra JMX Reporting"
Closes gh-14778
2018-10-12 10:41:47 +02:00
Phillip Webb d102e0d7f7 Introduce Ordered Filter and WebFilter interfaces
Add `Ordered` variants of `javax.servlet.Filter` and
`org.springframework.web.server.WebFilter` mainly so that we can
deprecate `FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER`.

Closes gh-14793
2018-10-11 23:13:23 -07:00
Phillip Webb d6df7cf324 Update copyright year for changed files 2018-10-11 22:39:43 -07:00
Phillip Webb 683e9532d6 Handle servlet startup failures consistently
Ensure that all servlet containers handle servlet startup failures
consistently and throw a `WebServerException` that wraps the original
cause.

Both Undertow and Jetty already dealt with startup failures in this
way, but Tomcat did not. The `TomcatEmbeddedContext` has now been
changed to no longer call `super.loadOnStartup` but instead re-implement
a version of that method that wraps and rethrows the original exception
(as long as `failCtxIfServletStartFails` is `true`, which it now is by
default).

Closes gh-14790
2018-10-11 22:31:40 -07:00
Phillip Webb 4823114e1c Polish 2018-10-11 22:30:49 -07:00
Phillip Webb 3da25c6d36 Remove TomcatEmbeddedContext.overrideLoadOnStart
Remove the reflection tests used to support the older variant of
`overrideLoadOnStart` that returned a void. Since we no longer support
that older version we can simply the code.

Closes gh-14789
2018-10-11 20:22:58 -07:00
Phillip Webb 74d48fb7a7 Merge branch '2.0.x' 2018-10-11 20:20:15 -07:00
Phillip Webb 21ebb94d49 Respect Tomcat's failCtxIfServletStartFails flag
Ensure that if the user has set `failCtxIfServletStartFails` to `true`
using a `ContextCustomizers` any Servlet init exceptions stop the
application from running.

Closes gh-14448
2018-10-11 20:12:01 -07:00
Phillip Webb b09057a73c Fix checkstyle violation
Fix unused import violation introduced during merge.
2018-10-11 17:55:41 -07:00
Madhura Bhave 29a43851b5 Merge branch '2.0.x' 2018-10-11 16:34:26 -07:00
Madhura Bhave 042d495d92 Set gradle-plugin attribute on the Bintray package
Closes gh-14447
2018-10-11 16:30:33 -07:00
Phillip Webb 01f7805c19 Merge branch '2.0.x' 2018-10-11 16:19:29 -07:00
Phillip Webb b1399db994 Add a warning about `webDriver` scope to the docs
Update the reference documentation with a warning about the `webDriver`
scope that we create.

Closes gh-13093
2018-10-11 16:17:24 -07:00
Phillip Webb 0d35af1813 Add "Encrypting Properties" documentation
Update the reference documentation with a section about encrypting
properties and a link to Spring Cloud Vault.

Closes gh-13618
2018-10-11 16:03:42 -07:00