Commit Graph

16332 Commits (782d8c63da767e5ee6d891410268a6f78c2ed21d)
 

Author SHA1 Message Date
Phillip Webb 6fb4fba43a Merge branch '1.5.x' 7 years ago
Phillip Webb dd0866000f Revert "Add text/plain error response support"
This reverts commit 23892e33d6.
7 years ago
Phillip Webb 7242ddae3c Polish 7 years ago
Andy Wilkinson aa27334671 Run deployment tests on JDK 9 and 10 where possible
Closes gh-10414
7 years ago
Andy Wilkinson e44bfbea4a Merge branch '1.5.x' 7 years ago
Andy Wilkinson c4923d6273 Ignore existing output when asserting captured log output
Closes gh-12734
7 years ago
Andy Wilkinson 7b39cdd5c4 Merge branch '1.5.x' 7 years ago
Andy Wilkinson ac88a60071 Ensure error is sent before Writer or OutputStream is used
Previously, ErrorPageFilter's ErrorResponseWrapper would delaying
sending an error back to the client. In cases where the response's
Writer or OutputStream was accessed and flushed or closed, this could
lead to the wrong response status being sent.

This commit updates ErrorResponseWrapper so that it will send any
capture error to the client before returning the response's Writer or
OutputStream. This ensures that closing the Writer or OutputStream
does not cause the response to be committed with the default response
status rather than the previously captured error status.

Such responses will now include the correct status, but will not be
forwarded to the error controller. Such forwarding is not possible
due to the response already having been committed.

Closes gh-11814
7 years ago
Andy Wilkinson b951397a7c Upgrade to Spring REST Docs 2.0.1.RELEASE
Closes gh-12681
7 years ago
Brian Clozel f6d16c8b99 Align WebFluxTags uri support on WebMvcTags
This commit ensures that `WebFluxTags` not only relies on
`BEST_MATCHING_PATTERN_ATTRIBUTE` or request URI to provide the "uri"
tag information.

To avoid cardinality explosion, HTTP not found and redirects are
assigned fixed uri tags.

Closes gh-12685
7 years ago
Stephane Nicoll ad6a888e47 Polish 7 years ago
Stephane Nicoll f99752283f Fix relaxed binding examples
Closes gh-12750
7 years ago
Stephane Nicoll bf06854218 Merge branch '1.5.x' 7 years ago
Stephane Nicoll 1805cc5696 Clarify optional use of ComponentScan
Closes gh-12739
7 years ago
Madhura Bhave 30e3cf4c01 Make sure property mapping exception are swallowed 7 years ago
Madhura Bhave e5f8078749 Support dots in System environment properties
Fixes gh-12728
7 years ago
Stephane Nicoll d14cd2cbae Upgrade to Spring Framework 5.0.5.RELEASE
Closes gh-12340
7 years ago
Stephane Nicoll f424297fef Upgrade to Reactor Bismuth SR8
Closes gh-12698
7 years ago
Stephane Nicoll 8210e3d85e Merge branch '1.5.x' 7 years ago
Stephane Nicoll 249af7d5aa Upgrade to Spring Framework 4.3.15
Closes gh-12344
7 years ago
Madhura Bhave fa4a3ab308 Don't force snapshot update for integration tests
See if that fixes intermittent NoClassDefFoundError.

See gh-12689
7 years ago
Andy Wilkinson e5f27c60f2 Merge branch '1.5.x' 7 years ago
Andy Wilkinson 288e71b6c1 Upgrade to GemFire 8.2.9
Closes gh-12748
7 years ago
Andy Wilkinson 195a66f009 Upgrade to Hibernate Validator 6.0.9.Final
Closes gh-12746
7 years ago
Andy Wilkinson d5caddf4ca Upgrade to Rxjava 1.3.8
Closes gh-12745
7 years ago
Andy Wilkinson 16f5f8d53c Upgrade to Lettuce 5.0.3.RELEASE
Closes gh-12744
7 years ago
Andy Wilkinson e20fcf0e17 Merge branch '1.5.x' 7 years ago
Andy Wilkinson dee8750aff Stop Jetty in Jetty8JettyEmbeddedServletContainerFactoryTests
Closes gh-12734
7 years ago
Andy Wilkinson edc00eef24 Ensure that Tomcat is completely stopped when its initialization fails
Closes gh-12736
7 years ago
Andy Wilkinson 30de75c75c Ensure that Jetty is completely stopped when it fails to start
Closes gh-12735
7 years ago
Stephane Nicoll 6c61cbf5f7 Merge pull request #12711 from ruifigueira:feature/test-property-values-doc
* pr/12711:
  Remove outdated reference to `EnvironmentTestUtils`
7 years ago
Rui Figueira 958aa5db55 Remove outdated reference to `EnvironmentTestUtils`
Documentation still refers to the now deprecated `EnvironmentTestUtils`
class instead of `TestPropertyValues` for setting environment values in
tests.

This commit replaces it with `TestPropertyValues` and provides an
equivalent code example.

Closes gh-12711
7 years ago
Andy Wilkinson 72cf471e83 Merge branch '1.5.x' 7 years ago
Andy Wilkinson 399455f65a Merge pull request #12715 from Wenwei Liao
* gh-12715:
  Polish "Use modifiable set for @ServletComponentScan with no packages"
  Use modifiable set for @ServletComponentScan with no packages
7 years ago
Andy Wilkinson 6078fdaed8 Polish "Use modifiable set for @ServletComponentScan with no packages"
Closes gh-12715
7 years ago
Wenwei Liao 7bec780281 Use modifiable set for @ServletComponentScan with no packages
Previously, when a project contained multiple `@ServletComponentScan`
annotated classes in classpath, and at least one annotation don't
explicitly specify `basePackages` and `basePackageClass` attribute,
the application could fail to start with an
UnsupportedOperationException. The failure occurred due to the
creating of an unmodifiable set when no base packages are configured
and a subsequent attempt to add base packages to that sit.

This commit fixes the issue by removing the use of an unmodifiable set
when `@ServletComponentScan` with no base packages in processed before
any other `@ServletComponentScan` annotations.

See gh-12715
7 years ago
Stephane Nicoll b6f9b46be8 Only create a WebTestClient with WebFlux
This commit updates WebTestClientAutoConfiguration to only create a
WebTestClient when running a WebFlux-based application as mocking the
context only works with that mode at the moment.

Closes gh-12318
7 years ago
Stephane Nicoll 5bf4a5fa98 Merge pull request #12683 from jkschneider:gh-12676
* pr/12683:
  Polish "Remove HierarchicalNameMapper as a configured @Bean"
  Remove HierarchicalNameMapper as a configured @Bean
7 years ago
Stephane Nicoll 7dbeaaa932 Polish "Remove HierarchicalNameMapper as a configured @Bean"
Closes gh-12683
7 years ago
Jon Schneider 8572a091b8 Remove HierarchicalNameMapper as a configured @Bean
HierarchicalNameMapper is not a component that can be shared amongst
multiple monitoring systems.

See gh-12683
7 years ago
Stephane Nicoll 7c36c00331 Fix default HierarchicalNameMapper implementation for Graphite
Closes gh-12557
7 years ago
Stephane Nicoll 958f3d5bf5 Merge pull request #12725 from izeye:destroy-method
* pr/12725:
  Remove destroyMethod attribute in @Bean for MeterRegistry
7 years ago
Johnny Lim 4ab439856c Remove destroyMethod attribute in @Bean for MeterRegistry
Closes gh-12725
7 years ago
Andy Wilkinson 3568019118 Merge branch '1.5.x' 7 years ago
Andy Wilkinson 2fd177f923 Upgrade to Spring Security 4.2.5.RELEASE
Closes gh-12731
7 years ago
Andy Wilkinson 3b2ecd7884 Upgrade to Groovy 2.4.15
Closes gh-12730
7 years ago
Stephane Nicoll 373e741a79 Merge pull request #12722 from attilapapai:master
* pr/12722:
  Add space between right parentheses and next word
7 years ago
Attila Pápai 95385cecba Add space between right parentheses and next word
Closes gh-12722
7 years ago
Stephane Nicoll 18a860d969 Merge pull request #12697 from graben:docu-fix
* pr/12697:
  Fix outdated import statements
7 years ago
Benjamin Graf 101a42c572 Fix outdated import statements
Closes gh-12697
7 years ago