Commit Graph

3268 Commits

Author SHA1 Message Date
Andy Wilkinson b787ea4802 Add property for media types of reactive Mustache views
Closes gh-28858
2022-03-17 20:10:37 +00:00
Andy Wilkinson 3a5a748ec0 Rework Mustache properties to show which are Servlet-specific
Closes gh-30273
2022-03-17 19:25:07 +00:00
Andy Wilkinson 2ba064c855 Merge branch '2.6.x' into 2.7.x
Closes gh-30277
2022-03-17 17:51:28 +00:00
Andy Wilkinson 3c117ca2d4 Merge branch '2.5.x' into 2.6.x
Closes gh-30276
2022-03-17 17:50:58 +00:00
Andy Wilkinson 2b75ea5fb8 Improve testing of spring.mustache.* properties
Closes gh-30274
2022-03-17 17:40:22 +00:00
Andy Wilkinson fee3b89b1b Merge branch '2.6.x' into 2.7.x
Closes gh-30257
2022-03-16 19:42:14 +00:00
Andy Wilkinson cdaafce614 Merge branch '2.5.x' into 2.6.x
Closes gh-30256
2022-03-16 19:41:14 +00:00
Andy Wilkinson 7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled
Closes gh-30250
2022-03-16 19:09:13 +00:00
Andy Wilkinson 81383e552a Merge branch '2.6.x' into 2.7.x
Closes gh-30254
2022-03-16 17:06:43 +00:00
Andy Wilkinson 6bc000565d Merge branch '2.5.x' into 2.6.x
Closes gh-30253
2022-03-16 17:06:17 +00:00
Andy Wilkinson 0accc3d67d Convert MustacheAutoConfigurationTests to application context runner
Closes gh-30252
2022-03-16 15:28:48 +00:00
Andy Wilkinson 2282f9cc88 Upgrade to Embedded Mongo 3.4.2
As part of the upgrade, the property for configuring features has
been removed as support for feature-aware versions has been removed
from Embedded Mongo. For advanced configuration where features were
specified, users should provide a MongodConfig bean instead.

Closes gh-29985
Closes gh-30219
2022-03-16 14:13:10 +00:00
Stephane Nicoll 695685996a Start building against Spring Kafka 2.8.4 snapshots
See gh-30190
2022-03-12 18:26:03 +01:00
Stephane Nicoll 3717c4c883 Start building against Spring Kafka 2.8.4 snapshots
See gh-30181
2022-03-12 12:50:26 +01:00
Andy Wilkinson 1c19995db7 Merge branch '2.6.x' into 2.7.x
Closes gh-30165
2022-03-11 11:03:20 +00:00
Andy Wilkinson 6bbf3aff0e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
2022-03-11 11:03:01 +00:00
Andy Wilkinson eef89c6c35 Increase tests' Cassandra timeouts to 60s
Closes gh-30163
2022-03-11 11:02:18 +00:00
Andy Wilkinson 6494a9f08a Merge branch '2.6.x' into 2.7.x
Closes gh-30165
2022-03-10 16:51:43 +00:00
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
2022-03-10 16:51:33 +00:00
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra
Closes gh-30163
2022-03-10 16:50:39 +00:00
Andy Wilkinson 813c2a5b1e Merge branch '2.6.x' into 2.7.x
Closes gh-30135
2022-03-09 14:45:55 +00:00
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x
Closes gh-30134
2022-03-09 14:44:51 +00:00
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests
Closes gh-29693
2022-03-09 14:41:13 +00:00
Brian Clozel 087e853c5d Refine GraphQL server auto-configuration
Prior to this commit, launching a GraphQL application without any schema
file or customizer bean would result in an exception caught by a
FailureAnalyzer telling the developer about configured locations.

Since then, a new client has been introduced in Spring GraphQL and the
mere presence of the GraphQL starter does not mean anymore that the
intent is to create a GraphQL API in the app: we could instead just
consume an existing, remote API.

This commit refines the GraphQL server auto-configuration so that it is
enabled only if:

* there is at least one schema file in the configured locations
* or a `GraphQlSourceCustomizer` bean has been defined in the app

These changes make the custom FailureAnalyzer useless and is also
removed as part of this commit.

Closes gh-30035
2022-03-08 17:54:55 +01:00
Brian Clozel bf79d6baef Auto-configure ConversionService for GraphQL
Prior to this commit, we would configure a default conversion service
for GraphQL annotated controllers, without registering any additional
formatters.

This commit aligns the GraphQL auto-configuration with MVC and WebFlux,
since we now use the `ApplicationConversionService` to register all
application formatters for the GraphQL infrastructure.

Closes gh-29638
2022-03-08 17:54:55 +01:00
rstoyanchev ef4add27f0 Do not set ConversionService on AnnotatedControllerConfigurer
After 0b449d89e1,
the ConversionService on AnnotatedControllerConfigurer is an internally
managed instance that is customized with FormatterRegistrar rather than
set.

Closes gh-29636
2022-03-08 17:54:54 +01:00
Brian Clozel 81754c8bc4 Upgrade to Spring GraphQL 1.0.0-SNAPSHOT
This commit switches to 1.0.0-SNAPSHOT for Spring GraphQL, before its
upcoming 1.0.0-M6 version.

This commit adapts to the changes introduced in
spring-projects/spring-graphql#317 : now that `GraphQlClient` has been
introduced, `GraphQlTester` has been aligned with the new
infrastructure. The `@GraphQlTest` and `@SpringBootTest` testing support
is now using different variants for each.

All samples have been updated to use the proper GraphQL terminology, see
and spring-projects/spring-graphql#310 .

See gh-29637
2022-03-08 17:54:54 +01:00
Andy Wilkinson dcaca38154 Merge branch '2.6.x' into 2.7.x
Closes gh-30099
2022-03-08 13:52:46 +00:00
Andy Wilkinson 119a713f09 Merge branch '2.5.x' into 2.6.x
Closes gh-30098
2022-03-08 13:52:25 +00:00
Andy Wilkinson e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate
Closes gh-30073
2022-03-08 13:51:38 +00:00
Moritz Halbritter 50d766020c Merge branch '2.6.x' into 2.7.x
Closes gh-30084
2022-03-07 13:22:53 +01:00
Moritz Halbritter 564555347f Merge branch '2.5.x' into 2.6.x
Closes gh-30083
2022-03-07 13:22:34 +01:00
Moritz Halbritter be38311c5d Disable incompatible tests on Linux AArch64
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
  @DisableOnOs annotation. This new annotation supports the architecture
  and is repeatable

Closes gh-30082
2022-03-07 13:22:17 +01:00
Stephane Nicoll ce4f7ded8a Merge branch '2.6.x' into 2.7.x
Closes gh-30081
2022-03-07 09:49:10 +01:00
Stephane Nicoll c6a9e138e5 Merge branch '2.5.x' into 2.6.x
Closes gh-30080
2022-03-07 09:49:00 +01:00
Stephane Nicoll cf9cc82025 Update copyright year of change file
See gh-30074
2022-03-07 09:47:12 +01:00
hak7a3 0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout
See gh-30074
2022-03-07 09:42:43 +01:00
Andy Wilkinson f44e7d9391 Merge branch '2.6.x' into 2.7.x
Closes gh-30071
2022-03-04 17:56:29 +00:00
Andy Wilkinson 2ef055a823 Merge branch '2.5.x' into 2.6.x
Closes gh-30070
2022-03-04 17:56:14 +00:00
Andy Wilkinson 1872af056e Make it clearer that the generated password is not for production use
Closes gh-30061
2022-03-04 17:55:54 +00:00
Andy Wilkinson 324c4310a4 Merge branch '2.6.x' into 2.7.x
Closes gh-30034
2022-03-02 12:21:29 +00:00
Andy Wilkinson 8a4a639734 Merge branch '2.5.x' into 2.6.x
Closes gh-30033
2022-03-02 12:21:20 +00:00
izeye 140d24d567 Remove redundant ConditionalOnMissingFilterBean
See gh-29983
2022-03-02 11:40:44 +00:00
Andy Wilkinson 19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
See gh-29976
2022-02-28 11:16:04 +00:00
dugenkui03 5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration
See gh-29976
2022-02-28 11:16:04 +00:00
Andy Wilkinson 73d0d5bccf Merge branch '2.6.x' into 2.7.x
Closes gh-30009
2022-02-28 11:15:24 +00:00
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
2022-02-28 11:15:02 +00:00
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
2022-02-28 10:54:31 +00:00
Madhura Bhave e24f5b7efd Revert "Upgrade to Embedded Mongo 3.4.1"
This reverts to Embedded Mongo 3.3.1 due to some breaking
changes in 3.4.1 and 3.4.2
2022-02-24 11:00:00 -08:00
Phillip Webb 9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00