Commit Graph

10568 Commits

Author SHA1 Message Date
Phillip Webb 5abc050a96 Support detection and with test initializers
Relax `SpringBootTestContextBootstrapper` rules so that a test can
specify an `ApplicationContextInitializer` and still have
`@SpringBootConfiguration` detected.

Prior to this commit detection would not occur because it's possible
that an initializer _could_ register configuration. This scenario is
actually quite unlikely to occur, certainly less likely than wanting to
use an initializer in combination with auto-detection.

Fixes gh-8483
2017-04-19 22:18:12 -07:00
Phillip Webb c9561f031c Refine validator and MVC validator configuration
Update `ValidationAutoConfiguration` and `WebMvcAutoConfiguration` to
ensure as much as possible that only a single Validator bean of each
type is registered.

Validation auto-configuration now does the following:
- If no validator is found: Registers a `LocalValidatorFactoryBean`
  (providing both Spring and JSR validation)
- If the user defines a Spring & JSR validator: Backs off
- If the user defines only a JSR validator: Adapts it to a Spring
  validator (without exposing another JSR implementation)

WebMvcAutoConfiguration auto-configuration has been updated to make
MVC validation follow common Spring Boot patterns:
- If not validator beans are found (due to the user excluding
  ValidationAutoConfiguration) a new `mvcValidator` bean will be
  registered.
- If a single validator bean is found it will be used for MVC
  validation.
- If multiple validator beans are defined it will either use the one
  named `mvcValidator` or it will register a new `mvcValidator` bean

Any automatically registered `mvcValidator` bean will not implement
the JSR validator interface.

Finally, it is no longer possible to provide an MVC validator via a
`WebMvcConfigurer`.

Fixes gh-8495
2017-04-19 22:18:12 -07:00
Madhura Bhave 2a7fd5011d Clarify docs on actuator security
Closes gh-8646
2017-04-19 15:32:02 -07:00
Stephane Nicoll 294f880fa3 Start build against Spring Data Ingalls snapshots
See gh-8939
2017-04-19 17:32:46 +02:00
Stephane Nicoll 382044c5aa Merge branch '1.4.x' into 1.5.x 2017-04-19 17:24:52 +02:00
Stephane Nicoll 3f3bb92690 Start building against Spring Data Hopper snapshots
See gh-8938
2017-04-19 17:24:01 +02:00
Stephane Nicoll ad616ea4a7 Revert "Upgrade to Spring Data Ingalls-SR2"
This commit reverts 65a8257 as the Couchbase driver must be upgraded from
2.3.x to 2.4.x

See gh-8939
2017-04-19 15:04:59 +02:00
Stephane Nicoll bc0016ade0 Merge branch '1.4.x' into 1.5.x 2017-04-19 15:00:16 +02:00
Stephane Nicoll 47d2756692 Revert "Upgrade to Spring Data Hopper-SR9"
This commit reverts 2deab52 as the Couchbase driver must be upgraded from
2.2.x to 2.4.x

See gh-8938
2017-04-19 14:59:57 +02:00
Stephane Nicoll 65a8257697 Upgrade to Spring Data Ingalls-SR2
Closes gh-8939
2017-04-19 14:35:15 +02:00
Stephane Nicoll e273fbbb6f Merge branch '1.4.x' into 1.5.x 2017-04-19 14:29:38 +02:00
Stephane Nicoll 2deab52ad0 Upgrade to Spring Data Hopper-SR9
Closes gh-8938
2017-04-19 14:28:52 +02:00
Stephane Nicoll 598beeea9d Merge branch '1.4.x' into 1.5.x 2017-04-19 09:33:04 +02:00
Stephane Nicoll 041c5957ae Merge pull request #8935 from garyrussell:si14
* pr/8935:
  Upgrade to Spring Integration 4.3.9.RELEASE
2017-04-19 09:31:36 +02:00
Gary Russell 58279f356d Upgrade to Spring Integration 4.3.9.RELEASE
Closes gh-8935
2017-04-19 09:31:18 +02:00
Stephane Nicoll 485c0ad1b7 Upgrade to Spring Framework 4.3.8.RELEASE
Closes gh-8712
2017-04-19 09:30:38 +02:00
Stephane Nicoll 43292a5e30 Merge pull request #8930 from garyrussell:amqp15
* pr/8930:
  Upgrade to Spring AMQP 1.7.2.RELEASE
2017-04-19 09:27:46 +02:00
Gary Russell 8a6bc65d86 Upgrade to Spring AMQP 1.7.2.RELEASE
Closes gh-8930
2017-04-19 09:26:55 +02:00
Stephane Nicoll 3da70e2a0e Merge branch '1.4.x' into 1.5.x 2017-04-19 09:26:31 +02:00
Stephane Nicoll 746978ac52 Merge pull request #8929 from garyrussell:amqp14
* pr/8929:
  Upgrade to Spring AMQP 1.6.9.RELEASE
2017-04-19 09:25:47 +02:00
Gary Russell 4344489328 Upgrade to Spring AMQP 1.6.9.RELEASE
Closes gh-8929
2017-04-19 09:25:28 +02:00
Phillip Webb 393c17b68b Support @SpringBootTest with @ContextHierarchy
Update SpringBootTestContextBootstrapper to detect `@ContextHierarchy`
annotations so that only the last child creates a
`WebApplicationContext`.

Prior to this commit a context hierarchy would start two embedded web
servers which is inconsistent with the `SpringApplicationBuilder`
behavior.

Fixes gh-8311
2017-04-18 14:56:12 -07:00
Andy Wilkinson b9be0e3e0f Skip actuator path extension content negotiation
Allow `PathExtensionContentNegotiationStrategy` to be bypassed by
actuator endpoints. Prior to this commit calling `/loggers/com.aaa.cab`
would return a HTTP 406 response due to `.cab` being a known extension.

Fixes gh-8765
2017-04-18 14:56:11 -07:00
Phillip Webb f3c45077ac Merge pull request #8924 from walterjs/master
* pull8924:
  Fail fast on getKeyFromServer() failure
2017-04-18 14:56:10 -07:00
Walter Seymore f5f65463d2 Fail fast on getKeyFromServer() failure
Update `ResourceServerTokenServicesConfiguration` to fail fast if the
`getKeyFromServer()` call fails. Since the key is part of the singleton
`JwtAccessTokenConverter` bean there is not real way to refresh without
restarting the application.

A hard failure seems preferable to an inconsistent state.

Closes gh-8924
2017-04-18 14:56:10 -07:00
Phillip Webb 8eb79b3c0f Polish 2017-04-18 11:13:12 -07:00
Stephane Nicoll 6c14420221 Merge branch '1.4.x' into 1.5.x 2017-04-18 10:42:48 +02:00
Stephane Nicoll 63cfad855c Fix continuation indent
Closes gh-8497
2017-04-18 10:41:53 +02:00
Stephane Nicoll 38b7d0eb40 Merge pull request #8906 from odin-delrio:fix-statsd-metrics-collection
* pr/8906:
  Polish "Fix statsd metrics collection for names with ":""
  Fix statsd metrics collection for names with ":"
2017-04-18 10:40:41 +02:00
Stephane Nicoll 9a5346f29c Polish "Fix statsd metrics collection for names with ":""
Closes gh-8906
2017-04-18 10:40:14 +02:00
Odín del Río 9e705c83c8 Fix statsd metrics collection for names with ":"
Statsd server is ignoring malformed metrics. This change introduces
a basic sanitizing to metric names for avoid losing those metrics.

See gh-8906
2017-04-18 10:40:14 +02:00
Phillip Webb b2ae6b5f50 Merge branch '1.4.x' into 1.5.x 2017-04-17 22:14:45 -07:00
Phillip Webb cdf3eadc95 Rename AbstractTemplateAvailabilityProvider
Rename `AbstractTemplateAvailabilityProvider` to
`PathBasedTemplateAvailabilityProvider`.

Closes gh-8913
2017-04-17 22:12:44 -07:00
Phillip Webb f46d799f31 Polish 2017-04-17 22:08:51 -07:00
Madhura Bhave 3fe0b844a6 Make HealthMvcEndpoint conditional on missing bean 2017-04-17 14:49:45 -07:00
Madhura Bhave 9e2d54feae Support json view with JacksonTester
Closes gh-8672
2017-04-17 11:14:26 -07:00
Stephane Nicoll e1f727719a Merge branch '1.4.x' into 1.5.x 2017-04-14 16:04:22 +02:00
Stephane Nicoll b7efec5401 Support case insensitive value for Cassandra's SchemaAction
Closes gh-8903
2017-04-14 16:04:04 +02:00
Stephane Nicoll 8c21e16cf1 Add reference to Infinispan starter
Closes gh-8592
2017-04-14 13:57:47 +02:00
Stephane Nicoll 9d0340a5ae Merge pull request #8889 from rajadilipkolli:patch-3
* pr/8889:
  Upgrade to Apache Maven 3.5.0
2017-04-14 09:29:00 +02:00
Raja Kolli 01da13cfe3 Upgrade to Apache Maven 3.5.0
Closes gh-8889
2017-04-14 09:28:16 +02:00
Stephane Nicoll b3c8511fb6 Merge branch '1.4.x' into 1.5.x 2017-04-13 10:24:07 +02:00
Stephane Nicoll 4fd9a8c468 Add missing spring.datasource.xa properties in the appendix
Closes gh-8895
2017-04-13 10:23:44 +02:00
Stephane Nicoll 584b61ecc1 Remove deprecated property 2017-04-12 16:16:19 +02:00
Stephane Nicoll 6567018b70 Merge branch '1.4.x' into 1.5.x 2017-04-12 14:36:48 +02:00
Stephane Nicoll 2579023035 Fix javadoc
Closes gh-8892
2017-04-12 14:36:02 +02:00
Stephane Nicoll f4ab574ea1 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:46:43 +02:00
Stephane Nicoll 072160863a Add a note about transactional tests and `webEnvironment`
Closes gh-8232
2017-04-12 11:46:06 +02:00
Stephane Nicoll 68c90b24c2 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:15:51 +02:00
Stephane Nicoll 40f4c89602 Document list merge restrictions with YAML
Closes gh-6911
2017-04-12 11:15:24 +02:00