Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Andy Wilkinson
2017-04-07 12:14:47 +01:00
parent ddd3f8ee6e 5dad7182db
commit c74f0a70ca
9 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastInstanceConfiguration.java vendored
View File

@@ -56,6 +56,7 @@ abstract class HazelcastInstanceConfiguration {
@Bean
public HazelcastCacheManager cacheManager(
HazelcastInstance existingHazelcastInstance) throws IOException {
@SuppressWarnings("deprecation")
Resource config = this.cacheProperties.getHazelcast().getConfig();
Resource location = this.cacheProperties.resolveConfigLocation(config);
if (location != null) {
@@ -86,6 +87,7 @@ abstract class HazelcastInstanceConfiguration {
@Bean
public HazelcastInstance hazelcastInstance() throws IOException {
@SuppressWarnings("deprecation")
Resource config = this.cacheProperties.getHazelcast().getConfig();
Resource location = this.cacheProperties.resolveConfigLocation(config);
if (location != null) {

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
View File

@@ -646,7 +646,7 @@ public class ConditionalOnMissingBeanTests {
public static class ExampleFactoryBean implements FactoryBean<ExampleBean> {
public ExampleFactoryBean(String value) {
Assert.state(!value.contains("$"));
Assert.state(!value.contains("$"), "value must not contain $");
}
@Override
@@ -669,7 +669,7 @@ public class ConditionalOnMissingBeanTests {
public static class NonspecificFactoryBean implements FactoryBean<Object> {
public NonspecificFactoryBean(String value) {
Assert.state(!value.contains("$"));
Assert.state(!value.contains("$"), "value must not contain $");
}
@Override