Commit Graph

3357 Commits (234eba327db43884c5f718d94295e23ac69cf4c5)

Author SHA1 Message Date
Moritz Halbritter 99a1b98e03 Merge branch '2.5.x' into 2.6.x
Closes gh-30551
3 years ago
Moritz Halbritter 41ab46d0c7 Fix wrong replacement hint for 'spring.data.neo4j.username'
Closes gh-30550
3 years ago
Brian Clozel 1c71567c94 Support "application/graphql+json" media type in GraphQL HTTP mapping
As seen in spring-projects/spring-graphql#108, the GraphQL HTTP spec now
requires the "application/graphql+json" media type and accepts
"application/json" for backwards compatibility.

This commit updates the `RouterFunction` definition for the GraphQL HTTP
endpoints so that both types are accepted.

Closes gh-30407
3 years ago
Stephane Nicoll 1da5a7a600 Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 546a7e5edb Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 17936b855c Polish 3 years ago
Andy Wilkinson b9029fcf9e Merge branch '2.6.x' into 2.7.x
Closes gh-30476
3 years ago
Andy Wilkinson 64beaba99f Merge branch '2.5.x' into 2.6.x
Closes gh-30475
3 years ago
Andy Wilkinson 8cb11b74cd Polish "Make MustacheViewResolver bean back off without Spring MVC"
See gh-30456
3 years ago
Craig Andrews 7101b5099f Make MustacheViewResolver bean back off without Spring MVC
See gh-30456
3 years ago
Andy Wilkinson 24e6417ddc Adapt to latest changes in Spring for GraphQL snapshots
See gh-30463
3 years ago
Brian Clozel 93817c708e Switch to Spring for GraphQL 1.0.0-SNAPSHOT
See gh-30463
3 years ago
Andy Wilkinson 685d2d4391 Polish
See gh-30152
3 years ago
Guirong Hu df417bf317 Simplify registration of Jackson mixin types
See gh-30152
3 years ago
Moritz Halbritter 45f393b76b Merge branch '2.6.x' into 2.7.x
Closes gh-30437
3 years ago
Moritz Halbritter c003d5b533 Merge branch '2.5.x' into 2.6.x
Closes gh-30436
3 years ago
Moritz Halbritter 0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically
Closes gh-30434
3 years ago
Andy Wilkinson 5d55c663ba Allow spring.data.mongodb.uri to take precedence over separate props
Closes gh-30067
3 years ago
Andy Wilkinson 3255da23a2 Merge branch '2.6.x' into 2.7.x
Closes gh-30388
3 years ago
Andy Wilkinson c739831087 Merge branch '2.5.x' into 2.6.x
Closes gh-30387
3 years ago
Andy Wilkinson d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types
Closes gh-30280
3 years ago
Andy Wilkinson 3ee44ca0b0 Merge branch '2.6.x' into 2.7.x
Closes gh-30386
3 years ago
Andy Wilkinson f378627f94 Merge branch '2.5.x' into 2.6.x
Closes gh-30385
3 years ago
Andy Wilkinson 8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config
Closes gh-30384
3 years ago
Andy Wilkinson 47540eec61 Align default indices options with Spring Data Elasticsearch
Closes gh-30378
3 years ago
Andy Wilkinson 79ee53a587 Merge branch '2.6.x' into 2.7.x
Closes gh-30377
3 years ago
Andy Wilkinson f063da30d2 Merge branch '2.5.x' into 2.6.x
Closes gh-30376
3 years ago
Andy Wilkinson a8bddeb9cf Remove redundant setting of refresh policy
Closes gh-30375
3 years ago
Brian Clozel bae62c39a9 Adapt to latest Spring GraphQL changes
This commit adapts to the latest Spring GraphQL changes, renaming
`GraphQlService` to `ExecutionGraphQlService` as well as the
`WebInterceptor` contract to `WebGraphQlHandlerInterceptor`.

See spring-projects/spring-graphql#332
3 years ago
Stephane Nicoll a2959bbcf2 Polish "Add support for cache2k in memory caching"
See gh-28498
3 years ago
Jens Wilke 774f61fcb5 Add support for cache2k in memory caching
See gh-28498
3 years ago
Scott Frederick a14f3ed200 Use a ConfigurationProperties class for JMX properties
Closes gh-30327
3 years ago
Scott Frederick e5a09b3b31 Apply unique-names consistently in JmxAutoConfiguration
Ensure that the `spring.jmx.unique-names` property is applied to the
auto-configured `MBeanExporter` as well as the `ObjectNamingStrategy`.

Fixes gh-29968
3 years ago
Stephane Nicoll 1169c6df16 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30326
3 years ago
Andy Wilkinson c2d7e21312 Merge branch '2.6.x' into 2.7.x
Closes gh-30322
3 years ago
Andy Wilkinson 26719a211b Merge branch '2.5.x' into 2.6.x
Closes gh-30321
3 years ago
Andy Wilkinson 1669062231 Apply server.tomcat.keep-alive-timeout to HTTP/2
Closes gh-30267
3 years ago
Stephane Nicoll 2ab0ce3ea7 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30303
3 years ago
Stephane Nicoll 2fbb36bd04 fixup! Upgrade to Flyway 8.5.4 3 years ago
Andy Wilkinson b787ea4802 Add property for media types of reactive Mustache views
Closes gh-28858
3 years ago
Andy Wilkinson 3a5a748ec0 Rework Mustache properties to show which are Servlet-specific
Closes gh-30273
3 years ago
Andy Wilkinson 2ba064c855 Merge branch '2.6.x' into 2.7.x
Closes gh-30277
3 years ago
Andy Wilkinson 3c117ca2d4 Merge branch '2.5.x' into 2.6.x
Closes gh-30276
3 years ago
Andy Wilkinson 2b75ea5fb8 Improve testing of spring.mustache.* properties
Closes gh-30274
3 years ago
Andy Wilkinson fee3b89b1b Merge branch '2.6.x' into 2.7.x
Closes gh-30257
3 years ago
Andy Wilkinson cdaafce614 Merge branch '2.5.x' into 2.6.x
Closes gh-30256
3 years ago
Andy Wilkinson 7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled
Closes gh-30250
3 years ago
Andy Wilkinson 81383e552a Merge branch '2.6.x' into 2.7.x
Closes gh-30254
3 years ago
Andy Wilkinson 6bc000565d Merge branch '2.5.x' into 2.6.x
Closes gh-30253
3 years ago
Andy Wilkinson 0accc3d67d Convert MustacheAutoConfigurationTests to application context runner
Closes gh-30252
3 years ago
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
3 years ago
Stephane Nicoll 695685996a Start building against Spring Kafka 2.8.4 snapshots
See gh-30190
3 years ago
Stephane Nicoll 3717c4c883 Start building against Spring Kafka 2.8.4 snapshots
See gh-30181
3 years ago
Andy Wilkinson 1c19995db7 Merge branch '2.6.x' into 2.7.x
Closes gh-30165
3 years ago
Andy Wilkinson 6bbf3aff0e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
3 years ago
Andy Wilkinson eef89c6c35 Increase tests' Cassandra timeouts to 60s
Closes gh-30163
3 years ago
Andy Wilkinson 6494a9f08a Merge branch '2.6.x' into 2.7.x
Closes gh-30165
3 years ago
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
3 years ago
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra
Closes gh-30163
3 years ago
Andy Wilkinson 813c2a5b1e Merge branch '2.6.x' into 2.7.x
Closes gh-30135
3 years ago
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x
Closes gh-30134
3 years ago
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests
Closes gh-29693
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
Andy Wilkinson dcaca38154 Merge branch '2.6.x' into 2.7.x
Closes gh-30099
3 years ago
Andy Wilkinson 119a713f09 Merge branch '2.5.x' into 2.6.x
Closes gh-30098
3 years ago
Andy Wilkinson e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate
Closes gh-30073
3 years ago
Moritz Halbritter 50d766020c Merge branch '2.6.x' into 2.7.x
Closes gh-30084
3 years ago
Moritz Halbritter 564555347f Merge branch '2.5.x' into 2.6.x
Closes gh-30083
3 years ago
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
3 years ago
Stephane Nicoll ce4f7ded8a Merge branch '2.6.x' into 2.7.x
Closes gh-30081
3 years ago
Stephane Nicoll c6a9e138e5 Merge branch '2.5.x' into 2.6.x
Closes gh-30080
3 years ago
Stephane Nicoll cf9cc82025 Update copyright year of change file
See gh-30074
3 years ago
hak7a3 0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout
See gh-30074
3 years ago
Andy Wilkinson f44e7d9391 Merge branch '2.6.x' into 2.7.x
Closes gh-30071
3 years ago
Andy Wilkinson 2ef055a823 Merge branch '2.5.x' into 2.6.x
Closes gh-30070
3 years ago
Andy Wilkinson 1872af056e Make it clearer that the generated password is not for production use
Closes gh-30061
3 years ago
Andy Wilkinson 324c4310a4 Merge branch '2.6.x' into 2.7.x
Closes gh-30034
3 years ago
Andy Wilkinson 8a4a639734 Merge branch '2.5.x' into 2.6.x
Closes gh-30033
3 years ago
izeye 140d24d567 Remove redundant ConditionalOnMissingFilterBean
See gh-29983
3 years ago
Andy Wilkinson 19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
See gh-29976
3 years ago
dugenkui03 5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration
See gh-29976
3 years ago
Andy Wilkinson 73d0d5bccf Merge branch '2.6.x' into 2.7.x
Closes gh-30009
3 years ago
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
3 years ago
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
3 years ago
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
3 years ago
Phillip Webb 9f00c3acf5 Polish 3 years ago
Phillip Webb adfaa8f778 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 57009d5623 Polish 3 years ago
Moritz Halbritter fd36215d72 Omit empty values for AutoConfigureAfter and AutoConfigureBefore
As @AutoConfiguration is now meta-annotated with @AutoConfigureAfter
and @AutoConfigureBefore, the generated property files have a lot of
superfluous lines in the format <class>.AutoConfigureAfter= and
<class>.AutoConfigureBefore=.

One can now configure in the annotation processor for each property key
if empty values should be omitted. This is currently only activated for
AutoConfigureAfter and AutoConfigureBefore

See gh-29907
3 years ago
Moritz Halbritter 7872f61bfc Add @AutoConfiguration annotation support to the autoconfigure-processor
See gh-29907
3 years ago
Moritz Halbritter 9149ae50da Use @AutoConfiguration for relative ordering on auto-configurations 3 years ago
Moritz Halbritter 9e9049ca7f Add relative ordering to @AutoConfiguration
The relative ordering is implemented with @AliasFor annotations on the
@AutoConfiguration annotation. The production code already works without
changes, only the test code had to be modified. It now uses
AnnotationMetadata which already knows how to deal with @AliasFor
instead of using the reflection API directly.

See gh-29907
3 years ago
Andy Wilkinson 57cd34be88 Merge branch '2.6.x' into 2.7.x
Closes gh-29971
3 years ago
Andy Wilkinson a979925e63 Merge branch '2.5.x' into 2.6.x
Closes gh-29970
3 years ago
Andy Wilkinson 7aca75c58c Preserve ObjectName property order when name is unchanged
Closes gh-29953
3 years ago
Stephane Nicoll c8b7a17545 Upgrade to Spring Kafka 2.8.3
Closes gh-29722
3 years ago