Commit Graph

12804 Commits

Author SHA1 Message Date
Andy Wilkinson 00d8752437 Upgrade to Infinispan 8.2.8.Final
Closes gh-9808
2017-07-20 20:56:13 +01:00
Stephane Nicoll 5c33052334 Merge branch '1.5.x' 2017-07-20 14:59:28 +02:00
Stephane Nicoll 0a9cb5f076 Upgrade to Spring Framework 4.3.10.RELEASE
Closes gh-9806
2017-07-20 14:59:01 +02:00
Andy Wilkinson 0b11fb7ce0 Merge branch '1.5.x' 2017-07-20 10:39:43 +01:00
Andy Wilkinson f3b26525f7 Use System.out rather than err for ignored Class-Path entry message
Closes gh-9802
2017-07-20 10:37:49 +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 24d086066b Rework ApplicationContext test helper
Rename `ContextLoader` to `ApplicationContextTester` and provide
distinct subclasses for standard, web and reactive application contexts.

Context callbacks now return AssertJ compatible contexts, allowing
tests to run directly on context. For example:

	context.run((loaded) -> assertThat(loaded).hasBean("foo"));

The returned context can now also represent a context that has failed
to start (meaning that the `loadAndFail` methods are no longer needed):

	context.run((loaded) -> assertThat(loaded).hasFailed());

Configuration classes are loaded via the recently introduced
`Configurations` class. This means that the tester no longer needs to
be directly aware of auto-configuration concepts.

See gh-9634
2017-07-19 12:16:12 -07:00
Phillip Webb c6f55ef46d Add system property support to TestPropertyValues
Update `TestPropertyValues` so that it can also be used to update
system properties.  Properties are set before the call is made and
restored to their previous value afterwards.

Fixes gh-9792
2017-07-19 12:14:26 -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 9f6d8c6778 Add ConfigurableReactiveWebApplicationContext
Split the current `ReactiveWebApplicationContext` into two distinct
interfaces to mirror other Spring context interfaces. The
`ReactiveWebApplicationContext` interface now only exposes getters. The
`ConfigurableReactiveWebApplicationContext` exposes setters and extends
from `ConfigurableApplicationContext`.

Fixes gh-9794
2017-07-19 11:53:35 -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
Phillip Webb cd23de6ed5 Add more HealthIndicatorAutoConfiguration ordering
Update HealthIndicatorAutoConfiguration to ensure that it is configured
after ActiveMQAutoConfiguration.

Fixes gh-9793
2017-07-19 10:19:42 -07:00
Stephane Nicoll 10bcf60803 Merge branch '1.5.x' 2017-07-19 18:30:30 +02:00
Stephane Nicoll 9c28637185 Move code snippet to regular source file
Closes gh-9740
2017-07-19 18:29:39 +02:00
Stephane Nicoll 4b6e79c94f Merge pull request #9775 from garyrussell:kafkaProps
* pr/9775:
  Polish "Add support for arbitrary producer/consumer Kafka properties"
  Add support for arbitrary producer/consumer Kafka properties
2017-07-19 18:18:15 +02: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 43e1df7752 Merge branch '1.5.x' 2017-07-19 15:45:14 +02:00
Stephane Nicoll 87b554d062 Merge pull request #9497 from sun-jian:bugfix/dropwizard
* pr/9497:
  Fix metric check in case of duplicate metric
2017-07-19 15:44:18 +02:00
孙健 1745a5ee6f Fix metric check in case of duplicate metric
Closes gh-9497
2017-07-19 15:43:28 +02:00
Andy Wilkinson bc5e4418ea Merge branch '1.5.x' 2017-07-19 14:41:39 +01:00
Andy Wilkinson 144d987cb8 Polish 2017-07-19 14:41:32 +01:00
Andy Wilkinson 3ba53a4c6f Merge branch '1.5.x' 2017-07-19 14:40:25 +01:00
Andy Wilkinson 29f1bd9953 Make it clearer that default config locations are always used
Closes gh-4062
2017-07-19 14:39:27 +01:00
Stephane Nicoll e8566c8764 Merge branch '1.5.x' 2017-07-19 15:24:25 +02:00
Stephane Nicoll 85862e66e9 Merge pull request #9672 from rajadilipkolli:patch-1
* pr/9672:
  Fix JOOQ sample's compiler configuration
2017-07-19 15:24:13 +02:00
Raja Kolli 931eca188e Fix JOOQ sample's compiler configuration
Closes gh-9672
2017-07-19 14:44:07 +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 a57e6495dd Migrate from FileSystemUtils.deleteRecursively
Update test to migrate away from the now deprecated FileSystemUtils.
2017-07-18 20:22:24 -07: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
Andy Wilkinson ece246dbc2 Upgrade to Javax Mail 1.6.0
Closes gh-9783
2017-07-18 18:27:01 +01:00
Andy Wilkinson d578de4bc2 Upgrade to Reactor Bismuth-M3
Closes gh-9639
2017-07-18 18:25:32 +01:00
Brian Clozel 330aa704bb Clean HTTP Resources when NettyWebServer stops
This commit is a temporary workaround for gh-9146; it cleans the HTTP
resources associated with the Netty server.
2017-07-18 17:07:21 +02:00
Brian Clozel 20943238c2 Clean NettyWebServer tests
Remove ununsed tests after gh-9698
2017-07-18 17:06:50 +02:00
Stephane Nicoll e56798f347 Align to API change of Spring Data Cassandra 2017-07-18 15:09:09 +02:00
Madhura Bhave ecaa6340e2 Update path in actuator sample tests 2017-07-17 19:22:33 -07:00
Madhura Bhave c8951ae938 Fix javadoc 2017-07-17 17:38:06 -07: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
Madhura Bhave eb4fc16ee5 Add customizers for Reactive Web Servers
Closes gh-9572
2017-07-17 15:55:52 -07:00
Madhura Bhave 1a0f21983f Fix tests
Fixes gh-3832
2017-07-17 15:25:31 -07:00
Madhura Bhave 00430ac216 Ignore unbound env variables and system props
Closes gh-3832
2017-07-17 15:09:47 -07:00
Madhura Bhave b58923a42d Merge branch '1.5.x' 2017-07-17 11:27:08 -07:00
Madhura Bhave 0f8a819af9 Enable cors in default management security config
Fixes gh-9548
2017-07-17 10:49:48 -07:00
Stephane Nicoll 033442094b Merge branch '1.5.x' 2017-07-17 18:00:26 +02:00
Stephane Nicoll 2aa4ed2dec Merge pull request #9772 from rajadilipkolli:patch-3
* pr/9772:
  Remove duplicate entry in .gitignore
2017-07-17 18:00:14 +02:00
Raja Kolli d2ed8d6344 Remove duplicate entry in .gitignore
Closes gh-9772
2017-07-17 17:59:42 +02:00
Madhura Bhave 93caad5556 Polish 2017-07-14 15:25:40 -07:00