Commit Graph

1703 Commits

Author SHA1 Message Date
Phillip Webb
30ff329e3d Polish 2017-07-28 10:11:49 -07:00
Stephane Nicoll
92e48f6ee2 Fix build failure
This test definitely doesn't need Aspect processing since the project
doesn't have a dependency on `aspectjweaver`

Closes gh-9880
2017-07-28 13:43:58 +02:00
Stephane Nicoll
b9b284d3d0 Merge branch '1.5.x' 2017-07-28 12:02:54 +02:00
Stephane Nicoll
5c13b8bf50 Separate custom schema configuration for Liquibase test
Unfortunately, creating the schema in code did not offer the right
condition to reproduce the error scenario. This commit restore the
initial intent, but separating the configuration and cleaning the
created context properly.

See gh-9862
2017-07-28 11:59:15 +02:00
Stephane Nicoll
7736cb1dc5 Fix test so that it doesn't leave a datasource hanging around
Closes gh-9862
2017-07-28 11:43:28 +02:00
Stephane Nicoll
edee342d80 Merge branch '1.5.x' 2017-07-28 10:24:11 +02:00
Stephane Nicoll
7e21178f63 Polish "Use configured schema in Liquibase endpoint"
Closes gh-9862
2017-07-28 10:21:27 +02:00
Craig Andrews
3e13970fe0 Use configured schema in Liquibase endpoint
This commit makes sure that the Liquibase endpoint uses the configured
schema.

See gh-98£62
2017-07-28 10:21:27 +02:00
Phillip Webb
9127c48fb5 Fixup warnings 2017-07-27 16:39:49 -07:00
Spring Buildmaster
17a5bb0be4 Next development version 2017-07-27 08:00:21 +00:00
Phillip Webb
07556cda51 Restructure boot.test.context package
Split up `org.springframework.boot.test.context` into distinct packages
for `runner` and `assertj`.

See gh-9875
2017-07-26 17:47:59 -07:00
Phillip Webb
497457c397 Rename ApplicationContextTester -> Runner
Rename `ApplicationContextTester` and related classes to
`ApplicationContextRunner` and refactor existing tests to use correctly
named variables.

See gh-9875
2017-07-26 17:46:06 -07:00
Spring Buildmaster
41c5c0e7c9 Next development version 2017-07-26 08:30:55 +00:00
Emanuel Campolo
2626a3a795 Use lambdas when possible
Replace anonymous inner classes with lambda declarations (when possible
using method references).

See gh-9781
2017-07-25 00:53:38 -07:00
Emanuel Campolo
798fe5ed53 Collapse catch clauses
Use multi-catch for exceptions whenever possible.

See gh-9781
2017-07-25 00:53:37 -07:00
Emanuel Campolo
4a189bdee7 Replace Collections.sort() with direct sort call
Replace existing `Collections.sort(...)` calls with `.sort(...)`
directly on the collection instance.

See gh-9781
2017-07-25 00:53:37 -07:00
Emanuel Campolo
04fdec6f8b Replace explicit generics with diamond operator
Where possible, explicit generic declarations to use the Java 8 diamond
operator.

See gh-9781
2017-07-25 00:53:37 -07:00
Andy Wilkinson
6df1be3f1a Merge branch '1.5.x' 2017-07-22 08:22:35 +01:00
Johnny Lim
d18e452fcd Use currentHealth consistently in getHealth()
Closes gh-9832
2017-07-22 08:21:43 +01:00
Andy Wilkinson
d9837d7d1c Merge branch '1.5.x' 2017-07-21 17:31:53 +01:00
Andy Wilkinson
bbc34a676c Polish "Handle possible regexes defensively in NamePatternFilter"
Closes gh-9730
2017-07-21 17:24:01 +01:00
dbego
c29d1c756a Handle possible regexes defensively in NamePatternFilter
Previously, if a name contained part of a regex but wasn't actually
a regex, a PatternSyntaxException would be thrown and the request
would fail.

This commit updates NamePatternFilter to catch PatternSyntaxException
and treat the regex-like input as a name insteead.

See gh-9730
2017-07-21 17:21: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
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
43e1df7752 Merge branch '1.5.x' 2017-07-19 15:45:14 +02:00
孙健
1745a5ee6f Fix metric check in case of duplicate metric
Closes gh-9497
2017-07-19 15:43:28 +02: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
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
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
6db4330328 Prevent Elasticsearch from configuring Netty's available processors 2017-07-01 10:28:11 +01:00
Stephane Nicoll
de2cdd8528 Use lettuce rather than Jedis for actuator tests 2017-06-30 15:44:15 +02:00
Stephane Nicoll
6e32f49630 Migrate HealthIndicatorAutoConfigurationTests to ContextLoader 2017-06-30 14:52:56 +02:00
Stephane Nicoll
f2fe2c4dd5 Polish 2017-06-30 14:08:55 +02:00
Stephane Nicoll
8ea38d1cbe Merge branch '1.5.x' 2017-06-26 13:37:18 +02:00
Stephane Nicoll
88d16ddf6b Add missing class check
Closes gh-9602
2017-06-26 13:36:34 +02:00
Stephane Nicoll
01272fa0cc Polish "Add health indicator for Neo4j"
Closes gh-9557
2017-06-26 11:04:34 +02:00
Eric Spiegelberg
4c97dcb53a Add health indicator for Neo4j
See gh-9557
2017-06-26 10:31:02 +02:00
Andy Wilkinson
39c1757a96 Merge branch '1.5.x' 2017-06-21 14:31:21 -07:00
Andy Wilkinson
7a04708c41 Make sure the HealthMvcEndpoint is thread-safe
Previously, HealthMvcEndpoint stored the cached Health and its last
access time in two separate fields. Neither field was volatile and
no synchronization was used. This meant that there were potential
visibility problems. In a possible worst case scenario one field may
see the updated access time but an old health so it would incorrectly
believe that the old health was up-to-date and return it.

This commit reworks the endpoint to store the cached health and the
time at which it was created in a single, volatile field. This ensures
that the cached health and its creation time will be visible across
threads. Note that a race between threads when the cache is stale is
still possible. This race may result in multiple calls to the
delegate but these should be harmless.

Closes gh-9454
2017-06-21 14:19:10 -07:00
Stephane Nicoll
75274d3024 Merge branch '1.5.x' 2017-06-20 14:48:04 +02:00
Stephane Nicoll
3f70638f1c Polish "Use getUsableSpace() in DiskSpaceHealthIndicator"
Closes gh-9544
2017-06-20 14:44:11 +02:00
Huang YunKun
158416fdd0 Use getUsableSpace() in DiskSpaceHealthIndicator
See gh-9544
2017-06-20 14:43:38 +02:00