Commit Graph

16930 Commits

Author SHA1 Message Date
Andy Wilkinson
fe46392144 Merge branch '2.7.x' 2022-04-13 10:04:02 +01:00
Andy Wilkinson
27a936e466 Fix Elastic health indicator without RestHighLevelClient
Closes gh-28496
2022-04-13 10:02:47 +01:00
Stephane Nicoll
62069ead48 Merge branch '2.7.x' 2022-04-13 09:18:54 +02:00
Stephane Nicoll
00a481e4e9 Upgrade to Reactor 2020.0.18
Closes gh-30604
2022-04-13 09:17:43 +02:00
Andy Wilkinson
258ae5e153 Merge branch '2.7.x' 2022-04-12 21:58:41 +01:00
Andy Wilkinson
562627fb42 Deprecate auto-configuration for RestHighLevelClient
Closes gh-28598
2022-04-12 21:58:08 +01:00
Andy Wilkinson
4e054385a4 Polish 2022-04-12 21:58:08 +01:00
Andy Wilkinson
d5a92ccb8b Merge branch '2.7.x' 2022-04-12 21:20:34 +01:00
Andy Wilkinson
a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration"
See gh-28496
2022-04-12 21:13:05 +01:00
Filip Hrisafov
eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
2022-04-12 21:13:05 +01:00
Brian Clozel
e0ae1d3501 Use auto-configured JSON codecs for GraphQlTester
Prior to this commit, the auto-configured
`ExecutionGraphQlServiceTester` would use a default Jackson
`ObjectMapper` provided by the builder for its JSON
serialization/deserialization needs. Other testers, like the
`HttpGraphQlTester` are based on auto-configured components which
already use the auto-configured `ObjectMapper`.

This commit uses the newly introduced `encoder(Encoder<?>)` and
`decoder(Decoder<?>)` builder methods to configure custom JSON codecs
honoring the application configuration.

Closes gh-30646
2022-04-12 21:28:21 +02:00
rstoyanchev
b91bfc7067 Update WebMVC GraphQL autoconfig to the latest
As a result of changes for
https://github.com/spring-projects/spring-graphql/issues/342,
GraphQlWebSocketHandler now exposes a method to create the
WebSocketHttpRequestHandler, pre-configured with a context propagating
HandshakeInterceptor. This commit updates the autoconfig to use it.

Closes gh-30641
2022-04-12 20:17:29 +02:00
Brian Clozel
e57bbdfcf5 Polish
See gh-29666
2022-04-12 18:41:01 +02:00
Brian Clozel
3485070aee Switch to Spring Kafka SNAPSHOTs
See gh-30645
2022-04-12 17:40:01 +02:00
Brian Clozel
be88b62302 Switch to Spring Session SNAPSHOTs
See gh-30639
2022-04-12 17:22:46 +02:00
Brian Clozel
f2e295802d Switch to Spring Security SNAPSHOTs
See gh-30633
2022-04-12 17:22:16 +02:00
Brian Clozel
305a0c5c96 Switch to Spring HATEOAS SNAPSHOTs
See gh-30632
2022-04-12 17:03:34 +02:00
Brian Clozel
2651068c17 Switch to Spring Data SNAPSHOTs
See gh-30634
2022-04-12 17:02:51 +02:00
Brian Clozel
77b7f2f1ce Switch to Spring Framework SNAPSHOTs
See gh-30624
2022-04-12 17:02:03 +02:00
Andy Wilkinson
44211564a4 Adapt to latest changes in Micrometer 2.0 snapshots
See gh-29666
2022-04-12 15:25:43 +01:00
Andy Wilkinson
6580f6c742 Align with latest changes in Micrometer 1.9 snapshots
See gh-30605
2022-04-12 11:47:34 +01:00
Andy Wilkinson
b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson
48f8021d88 Migrate @Local*Port annotations to spring-boot-test
Closes gh-29589
2022-04-12 08:48:43 +01:00
Andy Wilkinson
8d18e5fc0e Merge branch '2.7.x' 2022-04-11 15:23:10 +01:00
Andy Wilkinson
b8b903527a Update tag keys to comply with Micrometer recommendations
Closes gh-30536
2022-04-11 15:21:35 +01:00
Stephane Nicoll
6f62e1c743 Start building against Spring Session 2021.2.0-RC1 snapshots
See gh-30611
2022-04-09 17:27:48 +02:00
Stephane Nicoll
2ed65b3035 Start building against Spring Security 2.7.0-RC1 snapshots
See gh-30609
2022-04-09 17:27:48 +02:00
Stephane Nicoll
8658765eb4 Start building against Spring Kafka 2.8.5 snapshots
See gh-30608
2022-04-09 17:27:48 +02:00
Stephane Nicoll
726c4e9ced Start building against Spring Retry 1.3.3 snapshots
See gh-30607
2022-04-09 17:15:20 +02:00
Stephane Nicoll
65efc75c6f Start building against Spring LDAP 2.4.0-RC1 snapshots
See gh-30606
2022-04-09 17:15:20 +02:00
Stephane Nicoll
454f409a14 Start building against Micrometer 1.9.0-RC1 snapshots
See gh-30605
2022-04-09 17:15:20 +02:00
Stephane Nicoll
719fb625ef Start building against Reactor 2020.0.18 snapshots
See gh-30604
2022-04-09 17:15:20 +02:00
Stephane Nicoll
2ded2bf71a Adapt to latest change in Spring Framework snapshots 2022-04-09 17:10:48 +02:00
Andy Wilkinson
6d865c2646 Merge branch '2.7.x' 2022-04-08 21:02:35 +01:00
Andy Wilkinson
7534e50d0b Merge branch '2.6.x' into 2.7.x
Closes gh-30621
2022-04-08 21:02:16 +01:00
Andy Wilkinson
7e44745816 Merge branch '2.5.x' into 2.6.x
Closes gh-30620
2022-04-08 21:01:48 +01:00
Andy Wilkinson
b88f062f04 Polish "Remove assumptions about ordering when comparing JSON in tests"
See gh-30514
2022-04-08 20:56:20 +01:00
Vivek Gupta
5b3bc1a936 Remove assumptions about ordering when comparing JSON in tests
See gh-30514
2022-04-08 20:55:54 +01:00
Andy Wilkinson
136189c86f Merge branch '2.7.x' 2022-04-08 14:05:07 +01:00
Andy Wilkinson
f209d77cb2 Merge branch '2.6.x' into 2.7.x
Closes gh-30617
2022-04-08 14:04:43 +01:00
Andy Wilkinson
d6731805b6 Merge branch '2.5.x' into 2.6.x
Closes gh-30616
2022-04-08 14:03:58 +01:00
Andy Wilkinson
70fa7e5e93 Make properties field final
Closes gh-30615
2022-04-08 14:03:29 +01:00
Stephane Nicoll
6aa8436c6d Start building against Spring Session 2021.0.6 snapshots
See gh-30595
2022-04-08 10:09:30 +02:00
Stephane Nicoll
455c37645d Start building against Spring Security 5.5.6 snapshots
See gh-30593
2022-04-08 10:09:00 +02:00
Stephane Nicoll
bb8be2425a Start building against Spring Kafka 2.7.13 snapshots
See gh-30592
2022-04-08 10:08:35 +02:00
Stephane Nicoll
aab8fc80ec Start building against Spring Data 2021.0.11 snapshots
See gh-30594
2022-04-08 10:08:10 +02:00
Stephane Nicoll
0080e45172 Start building against Spring Retry 1.3.3 snapshots
See gh-30590
2022-04-08 10:07:41 +02:00
Stephane Nicoll
5b05304c2c Start building against Spring LDAP 2.3.7 snapshots
See gh-30589
2022-04-08 10:07:13 +02:00
Stephane Nicoll
ea6e87adef Start building against Micrometer 1.7.11 snapshots
See gh-30588
2022-04-08 10:06:34 +02:00
Stephane Nicoll
e70451635c Start building against Spring Framework 5.3.19 snapshots
See gh-30516
2022-04-08 10:06:02 +02:00