Commit Graph

24246 Commits

Author SHA1 Message Date
Madhura Bhave
1fa83757ce Fix tests
See gh-19599
2020-01-10 13:22:53 -08:00
Madhura Bhave
139995469a Short circuit validation in bind handler if previous exception present
Closes gh-19599
2020-01-10 13:00:14 -08:00
Madhura Bhave
7f0573df49 Fallback on underlying server default when determining outcome tag
This commit also changed the default outcome to SUCCESS

Fixes gh-19367
2020-01-09 17:55:35 -08:00
Madhura Bhave
a017b8905a Adapt field name in ValidationBindHandler to a valid ConfigurationPropertyName
Fixes gh-19580
2020-01-09 17:08:39 -08:00
Andy Wilkinson
ccf4e1ad44 Merge branch '2.1.x' into 2.2.x
Closes gh-19591
2020-01-09 08:59:48 +00:00
Andy Wilkinson
117c2a0ed6 Merge pull request #19581 from dreis2211
* gh-19581:
  Fix links to external types in javadoc

Closes gh-19581
2020-01-09 08:59:32 +00:00
dreis2211
2b06f17c69 Fix links to external types in javadoc
See gh-19581
2020-01-09 08:59:25 +00:00
Stephane Nicoll
99c64b7cdf Merge branch '2.1.x' into 2.2.x
Closes gh-19589
2020-01-09 09:51:45 +01:00
Stephane Nicoll
ae52f2ad43 Merge pull request #19584 from matthiasstock
* pr/19584:
  Simplify validation pattern of EndpointId

Closes gh-19584
2020-01-09 09:44:41 +01:00
Matthias Stock
adfbbcc0f6 Simplify validation pattern of EndpointId
See gh-19584
2020-01-09 09:42:31 +01:00
Madhura Bhave
437941cc51 Improve diagnostics when using @ConstructorBinding on a Kotlin class
Closes gh-19312
2020-01-08 13:53:47 -08:00
Andy Wilkinson
02965e9744 Fix javadoc warnings
Fixes gh-19572
2020-01-08 14:02:24 +00:00
Andy Wilkinson
6d8f07d899 Merge branch '2.1.x' into 2.2.x
Closes gh-19570
2020-01-08 11:42:56 +00:00
Andy Wilkinson
bdffa860d9 Increase startup timeout for Docker containers
Closes gh-19569
2020-01-08 11:39:36 +00:00
Andy Wilkinson
e04055650c Merge branch '2.1.x' into 2.2.x
Closes gh-19567
2020-01-08 11:15:29 +00:00
Andy Wilkinson
3fb1bb74ba Configure WebTestClient to be able to consume large responses
Closes gh-19566
2020-01-08 11:14:42 +00:00
Madhura Bhave
82dc7bcc90 HypermediaAutoConfiguration should back off when Spring MVC absent
Fixes gh-19392
2020-01-07 14:28:58 -08:00
Madhura Bhave
87dd11502a Refactor HypermediaAutoConfigurationTests 2020-01-07 14:28:09 -08:00
Madhura Bhave
ac10ebba33 Fix checkstyle 2020-01-07 13:49:02 -08:00
Madhura Bhave
67fab60fbd Merge branch '2.1.x' into 2.2.x
Closes gh-19560
2020-01-07 13:33:32 -08:00
Madhura Bhave
6d6bbfb731 Merge pull request #19556 from scottfrederick
* pr/19556:
  Add profiles directly to the application environment for tests

Closes gh-19556
2020-01-07 13:23:41 -08:00
Scott Frederick
487b9cbf96 Add profiles directly to the application environment for tests
Prior to this commit, active profiles were being added to the Spring Boot
application environment by setting the `spring.profiles.active` property.
This could result in profiles getting parsed differently than other uses of `@ActiveProfiles`.
Setting the profiles directly in the `Environment` prevents this parsing.

See gh-19556
2020-01-07 13:23:09 -08:00
Andy Wilkinson
c57359ea3b Merge branch '2.1.x' into 2.2.x
Closes gh-19553
2020-01-07 12:05:21 +00:00
Andy Wilkinson
d46406fcb9 Remove loading of non-existent properties file from antlib
Fixes gh-19552
2020-01-07 12:04:59 +00:00
Brian Clozel
2f78c72f92 Avoid 406 Not Acceptable for error pages
Prior to this commit, the `ErrorController` would override the original
error response status if the error map cannot be written due to content
negotiation with the HTTP client. In that case, the error handling
infrastructure returns a `406 Not Acceptable` response.

This commit improves the `ErrorController` so that
`HttpMediaTypeNotAcceptableException` instances thrown by that
controller are not returned as is but instead we write the error
response with an empty body and the original HTTP error status.

Fixes gh-19545
See gh-19522
2020-01-06 18:08:35 +01:00
Stephane Nicoll
6a7e3c55b8 Merge pull request #19536 from dreis2211
* pr/19536:
  Remove deprecated usage of WebTestClientBuilderCustomizer

Closes gh-19536
2020-01-06 13:01:56 +01:00
dreis2211
6ffe47cd06 Remove deprecated usage of WebTestClientBuilderCustomizer
See gh-19536
2020-01-06 12:59:12 +01:00
Stephane Nicoll
620f5801a2 Merge pull request #19521 from rstoyanchev
* pr/19521:
  Improve Spring MVC auto-configuration section

Closes gh-19521
2020-01-04 11:40:40 +01:00
Rossen Stoyanchev
f6947648c9 Improve Spring MVC auto-configuration section
See gh-19521
2020-01-04 11:37:01 +01:00
Stephane Nicoll
58a805e607 Merge branch '2.1.x' into 2.2.x
Closes gh-19532
2020-01-04 11:34:25 +01:00
Stephane Nicoll
cb40454977 Merge pull request #19523 from dreis2211
* pr/19523:
  Upgrade CI to Artifactory Resource 0.0.10

Closes gh-19523
2020-01-04 11:32:42 +01:00
dreis2211
48032acd04 Upgrade CI to Artifactory Resource 0.0.10
See gh-19523
2020-01-04 11:31:36 +01:00
Madhura Bhave
c12a3f4172 Support explicitly setting forward headers strategy to NONE
Prior to this commit, there was no distinction between explicitly setting
forward headers strategy to a value of NONE and not setting it at all.
This meant that in a cloud environment, a cloud provider was always checked
to see if it was active and using forward headers and there was no way to
prevent that.

This commit changes the default value of the property to null so that there
is a way to determine if the property was explicitly set to NONE.

Fixes gh-19333
2020-01-03 14:19:48 -08:00
Madhura Bhave
8e285a4387 Fix checkstyle 2020-01-03 11:42:14 -08:00
Madhura Bhave
ac46f5971f Merge branch '2.1.x' into 2.2.x
Closes gh-19526
2020-01-03 11:19:21 -08:00
Madhura Bhave
24dd416f4b Add a test case for binding to map with wildcard types
This commit also changes the spring framework version
to use snapshots.

Closes gh-18767
2020-01-03 11:13:41 -08:00
Brian Clozel
1320c44a25 Use RBAC credentials for Couchbase cluster info
Prior to this commit, the Couchbase auto-configuration would use the
bucket credentials when RBAC is configured. This commit ensures that
RBAC is used in that case.

This commit also adds new configuration properties to customize the
bootstrap ports for Couchbase:

* `spring.couchbase.env.bootstrap.http-direct-port`
* `spring.couchbase.env.bootstrap.http-ssl-port`

Fixes gh-19393
2020-01-03 09:45:44 +01:00
Stephane Nicoll
fd4829c2ea Merge branch '2.1.x' into 2.2.x
Closes gh-19515
2020-01-03 09:39:42 +01:00
Stephane Nicoll
8ddcb9314e Merge pull request #19510 from dreis2211
* pr/19510:
  Update some copyrights to 2020

Closes gh-19510
2020-01-03 09:38:10 +01:00
dreis2211
9cbf5902dc Update some copyrights to 2020
See gh-19510
2020-01-03 09:37:22 +01:00
Stephane Nicoll
727870d9c9 Merge pull request #19508 from ge0ffrey
* pr/19508:
  Add reference to OptaPlanner starter

Closes gh-19508
2020-01-02 13:18:30 +01:00
Geoffrey De Smet
493762a416 Add reference to OptaPlanner starter
See gh-19508
2020-01-02 13:18:07 +01:00
Stephane Nicoll
66eb2a414f Merge pull request #19503 from ochiengolanga
* pr/19503:
  Polish "Fix outdated reference in ArtemisConfigurationCustomizer javadoc"
  Fix outdated reference in ArtemisConfigurationCustomizer javadoc

Closes gh-19503
2020-01-01 13:12:46 +01:00
Stephane Nicoll
7d36599343 Polish "Fix outdated reference in ArtemisConfigurationCustomizer javadoc"
See gh-19503
2020-01-01 13:11:39 +01:00
Ochieng Olanga
c6f7d12270 Fix outdated reference in ArtemisConfigurationCustomizer javadoc
See gh-19503
2020-01-01 13:10:34 +01:00
Stephane Nicoll
a684ab8726 Merge branch '2.1.x' into 2.2.x
Closes gh-19498
2019-12-31 10:07:32 +01:00
Stephane Nicoll
9dd3912a64 Merge pull request #19491 from izeye
* pr/19491:
  Polish doc

Closes gh-19491
2019-12-31 10:07:17 +01:00
Johnny Lim
27d7727d9f Polish doc
See gh-19491
2019-12-31 10:06:58 +01:00
Stephane Nicoll
1de30f0d00 Polish 2019-12-31 09:40:04 +01:00
Stephane Nicoll
b7e6febaa0 Merge branch '2.1.x' into 2.2.x
Closes gh-19496
2019-12-31 09:36:05 +01:00