Commit Graph

2924 Commits

Author SHA1 Message Date
Andy Wilkinson
c45a351308 Merge branch '1.5.x' 2017-07-24 11:19:51 +01:00
Andy Wilkinson
bb35e772c2 Polish "Make NarayanaRecoveryManagerBean conditional on missing bean"
Closes gh-9724
2017-07-24 11:17:39 +01:00
Gytis Trikleris
d8a6954744 Make NarayanaRecoveryManagerBean conditional on missing bean
See gh-9724
2017-07-24 11:16:34 +01:00
Andy Wilkinson
11fc7c1393 Merge branch '1.5.x' 2017-07-24 11:08:32 +01:00
Andy Wilkinson
8f877dcee2 Disable auto-config of Narayana's JMS support when JMS module absent
Closes gh-9844
2017-07-24 10:42:40 +01:00
Andy Wilkinson
39b4ecdf63 Adapt to breaking change in Spring Data
See gh-9834
2017-07-22 08:11:26 +01:00
Johnny Lim
bd27d147d7 Polish
Closes gh-9827
2017-07-21 15:38:00 +01:00
Andy Wilkinson
18cfd9d3dd Merge branch '1.5.x' 2017-07-21 15:36:27 +01:00
Andy Wilkinson
c70cc55db8 Polishing
See gh-9827
2017-07-21 15:35:57 +01:00
Andy Wilkinson
536c3bbd1c Merge branch '1.5.x' 2017-07-21 14:38:46 +01:00
Andy Wilkinson
15410a406e Revert "Stop auto-config of MethodValidationPP triggering early init"
5198fe887b. The underlying Framework
problem that prevents @Lazy from working properly is still there
in some form or another.

See gh-9416
2017-07-21 14:35:58 +01:00
Andy Wilkinson
1fe84225e5 Merge branch '1.5.x' 2017-07-21 13:39:01 +01:00
Andy Wilkinson
5198fe887b Stop auto-config of MethodValidationPP triggering early init
Previously, if a user's configuration class provided a custom
Validator bean, that configuration class would be initialized very
early so that the Validator could be used to create the
auto-configured MethodValidationPostProcessor. This early
initialization could problems as it may prevent any of the
configuration class's dependencies from being post-processed.

This commit updates the injection of the Validator bean to be lazy,
thereby preventing the creation of the auto-configured
MethodValidationPostProcessor from triggering early initialization.

Closes gh-9416
2017-07-21 13:33:33 +01:00
Phillip Webb
e1ef2a591f Fixup tests to use new ApplicationContextTester
Update existing tests that previously use `ContextLoader` to the newly
introduced `*ApplicationContextTester` classes.

See gh-9634
2017-07-19 12:40:53 -07:00
Phillip Webb
2f0f25f5ad Add Configurations class
Add a general purpose `Configurations` class that encapsulates the
sorting and merging rules that are usually apply. The class is
particularly useful in tests where configuration classes often need
to be specified, but an `@Import` or `ImportSelector` cannot be easily
used.

Two `Configurations` subclasses have been initially added. The
`UserConfigurations` class can be used to represent user defined
configuration and the `AutoConfigurations` class can be used to
represent a subset of auto-configurations. Auto configurations are
sorted using the same `@AutoConfiguraionBefore`/`@AutoConfiguraionAfter`
logic as the `@EnableAutoConfiguration` annotation.

Fixes gh-9795
2017-07-19 11:56:21 -07:00
Phillip Webb
9db72450da Merge branch '1.5.x' 2017-07-19 10:23:23 -07:00
Phillip Webb
68910f2b8f Polish 2017-07-19 10:21:06 -07:00
Stephane Nicoll
38ad582959 Polish "Add support for arbitrary producer/consumer Kafka properties"
Closes gh-9775
2017-07-19 18:17:55 +02:00
Gary Russell
191752d2c0 Add support for arbitrary producer/consumer Kafka properties
PR #7672 Added support for arbitrary common properties.

However, Kafka emits a warning if a producer configuration contains
properties intended only for consumers, and vice versa.

The documentation showed a sample of how to write code to configure
arbitrary properties but this is inconvenient.

Add arbitrary properties to the consumer and procucer configs.

See gh-9775
2017-07-19 18:02:28 +02:00
Stephane Nicoll
d9f2770006 Merge branch '1.5.x' 2017-07-19 14:38:55 +02:00
Stephane Nicoll
7e97d38de7 Polish Javadoc
Closes gh-9726
2017-07-19 14:38:38 +02:00
Phillip Webb
75aebfaf27 Fix WebClientAutoConfigurationTests
Update tests to return a mock response rather than Mono.empty().
2017-07-18 15:00:57 -07:00
Stephane Nicoll
e56798f347 Align to API change of Spring Data Cassandra 2017-07-18 15:09:09 +02:00
Madhura Bhave
39ec335d41 Merge branch '1.5.x' 2017-07-17 17:03:26 -07:00
Madhura Bhave
6381b88736 Create Jwk and Jwt token store beans conditionally
Closes gh-9777
2017-07-17 16:51:16 -07:00
Phillip Webb
51c2b049c2 Fix CodecsAutoConfiguration following API change
Update CodecsAutoConfiguration to align with the latest Spring Framework
changes.
2017-07-13 13:43:50 -07:00
Phillip Webb
c1101e7eb2 Formatting 2017-07-13 13:41:18 -07:00
Stephane Nicoll
9df0992bd9 Polish "Align with breaking API changes in RedisCacheManager"
Closes gh-9734
2017-07-13 10:59:16 +02:00
Mark Paluch
d22cd0cc9e Align with breaking API changes in RedisCacheManager
See gh-9734
2017-07-13 10:54:47 +02:00
Johnny Lim
360e3a492c Polish
closes gh-9729
2017-07-12 13:25:19 +02:00
Phillip Webb
8e3baf3130 Polish 2017-07-11 13:57:21 -07:00
Stephane Nicoll
cb13c98649 Polish 2017-07-08 15:36:18 +02:00
Stephane Nicoll
fa71051ec6 Polish "Upgrade to Infinispan 9.0.3.Final"
Closes gh-9688
2017-07-08 15:30:13 +02:00
Stephane Nicoll
ef5c2afcc9 Polish 2017-07-07 11:11:16 +01:00
Andy Wilkinson
dd0ce54425 Improve the type-safety of ContextLoader for servlet and reactive web 2017-07-07 11:11:16 +01:00
Andy Wilkinson
19ddfad63e Migrate some more tests to the new ContextLoader 2017-07-07 11:11:16 +01:00
Phillip Webb
eb17aa06f9 Merge branch '1.5.x' 2017-07-06 18:38:52 -07:00
Phillip Webb
aa57ca7e18 Polish 2017-07-06 16:53:04 -07:00
Andy Wilkinson
b11053afc4 Align with breaking API changes in Spring Data MongoDB 2017-07-04 17:31:07 +01:00
Brian Clozel
64777204d8 Apply codecs auto-configuration to WebFlux
This commit introduces `CodecCustomizer`, a new callback-based interface
for customizing the codecs configuration for WebFlux server and client.

Instances of those customizers are applied to the `WebClient.Builder`
and to the `WebFluxAutoConfiguration` (which deals with both WebFlux and
WebFlux.fn).

For now, only Jackson codecs are auto-configured, by getting the
`ObjectMapper` instance created by Spring Boot. Other codecs can be
configured as soon as WebFlux supports those.

Closes gh-9166
2017-07-03 11:23:06 +02:00
Brian Clozel
4ce726b1a0 Auto-configure WebClient.Builder
This commit adds a new customizer interface for applying
configuration changes to `WebClient.Builder` beans:
`WebClientCustomizer`.

The new WebClient auto-configuration will make available, as a
prototype scoped bean, `WebClient.Builder` instances.
Once injected, developers can use those to create `WebClient`
instances to be used in their application.

`WebClientCustomizer` beans are sorted according to their
`Order` and then applied to the builder instances.

Closes gh-9522
2017-07-03 11:23:06 +02:00
Stephane Nicoll
18ba414000 Add test helper to manipulate the ApplicationContext
This commit adds ContextLoader, a test helper that configures an
ApplicationContext that is meant to simulate a particular
auto-configuration scenario.

The auto-configuration, user configuration and environment can be
customized. The loader invokes a ContextConsumer to assert the context
and automatically close the context once it is done.

Concretely, tests can create a shared field instance of that helper with
the shared configuration to increase its visibility and tune the context
further in each test.

If the context is expected to fail, `loadAndFail` allows to optionally
assert the root exception and consume it for further assertions.

This commit also migrates some tests to illustrate the practical use of
the helper

Closes gh-9634
2017-06-29 15:34:10 +02:00
Stephane Nicoll
2892039ccd Better tests for datasource initialization
See gh-9528
2017-06-28 10:48:47 +02:00
Stephane Nicoll
4e19c47e78 Fix wrong assertion 2017-06-28 10:31:14 +02:00
Stephane Nicoll
1ba0df99b2 Polish 2017-06-28 09:40:31 +02:00
Stephane Nicoll
557361c9e0 Properly set redis password for Cluster and Sentinel config
Closes gh-9583
2017-06-27 15:47:07 +02:00
Stephane Nicoll
1a839d6656 Remove useless cluster check 2017-06-27 15:23:36 +02:00
Stephane Nicoll
1b181b2f34 Upgrade to Tomcat 8.5.16
This commit uses the replacement for deprecated APIs in 8.5.16 to ease
a forward compatibility with Tomcat 9

Closes gh-9611
2017-06-27 14:38:02 +02:00
Johnny Lim
533c418ad4 Polish
Closes gh-9610
2017-06-27 08:51:11 +02:00
Andy Wilkinson
5a4ef50ef1 Adapt to API changes in Spring Data Commons 2017-06-26 17:21:14 +01:00