3543 Commits

Author SHA1 Message Date
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
Phillip Webb
adfaa8f778 Merge branch '2.6.x' into 2.7.x 2022-02-23 21:44:37 -08:00
Phillip Webb
9411fc264d Merge branch '2.5.x' into 2.6.x 2022-02-23 21:44:08 -08:00
Phillip Webb
57009d5623 Polish 2022-02-23 21:43:42 -08:00
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
2022-02-23 15:39:46 +01:00
Moritz Halbritter
7872f61bfc Add @AutoConfiguration annotation support to the autoconfigure-processor
See gh-29907
2022-02-23 15:39:46 +01:00
Moritz Halbritter
9149ae50da Use @AutoConfiguration for relative ordering on auto-configurations 2022-02-23 15:39:46 +01:00
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
2022-02-23 15:39:41 +01:00
Andy Wilkinson
57cd34be88 Merge branch '2.6.x' into 2.7.x
Closes gh-29971
2022-02-23 11:53:09 +00:00
Andy Wilkinson
a979925e63 Merge branch '2.5.x' into 2.6.x
Closes gh-29970
2022-02-23 11:52:57 +00:00
Andy Wilkinson
7aca75c58c Preserve ObjectName property order when name is unchanged
Closes gh-29953
2022-02-23 11:30:21 +00:00
Stephane Nicoll
c8b7a17545 Upgrade to Spring Kafka 2.8.3
Closes gh-29722
2022-02-23 08:27:24 +01:00
Scott Frederick
c1fec6967e Support constructor injection for FailureAnalyzers
This commit adds support for instantiating FailureAnalyzer
implementations with BeanFactory and/or an Environment constructor
arguments and deprecates support for setter injection of these values
using BeanFactoryAware and EnvironmentAware.

Closes gh-29811
2022-02-22 14:24:59 -06:00
Stephane Nicoll
dda3bae02a Upgrade to Embedded Mongo 3.4.1
Closes gh-29944
2022-02-22 14:56:50 +01:00
Andy Wilkinson
da96eeab21 Remove redundant requestMappingHandlerMapping override
The bean no longer needs to be primary so the override is not needed
any more.

Closes gh-29682
2022-02-21 18:59:29 +00:00
Stephane Nicoll
935d37b2ca Polish "Reuse BatchLoaderRegistry in GraphQlService"
See gh-29929
2022-02-21 18:16:07 +01:00
dugenkui03
043e5ff0f5 Reuse BatchLoaderRegistry in GraphQlService
See gh-29929
2022-02-21 18:00:52 +01:00
Moritz Halbritter
1325153ee9 Move ManagementContextConfiguration from spring.factories
The import selector will now, in addition to spring.factories, look for
ManagementContextConfiguration classes in a file called
META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

The existing ManagementContextConfigurations have been moved from
spring.factories to the new file.

Closes gh-29730
2022-02-21 13:16:12 +01:00
Moritz Halbritter
d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
2022-02-21 10:34:38 +01:00
Stephane Nicoll
3ffd88158e Polish "Add support for Redis sentinel username"
See gh-29661
2022-02-21 09:52:29 +01:00
mourezwell
202a426bd6 Add support for Redis sentinel username
See gh-29661
2022-02-21 09:52:15 +01:00
Gary Russell
d56403b64f Add support for Kafka immediateStop property
See gh-29884
2022-02-21 09:29:41 +01:00
Moritz Halbritter
4f49e8c990 Polish JavaDoc 2022-02-18 13:14:42 +01:00
Andy Wilkinson
0e5a82522c Merge branch '2.6.x' into 2.7.x
Closes gh-29904
2022-02-18 11:42:21 +00:00
Andy Wilkinson
9da6fb4a5a Merge branch '2.5.x' into 2.6.x
Closes gh-29903
2022-02-18 11:42:10 +00:00
Andy Wilkinson
c676b8b84d Remove KafkaPropertiesKafka24Tests
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.

Closes gh-29882
2022-02-18 11:41:24 +00:00