root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

This commit is contained in:
Stephane Nicoll 2016-02-22 14:38:21 +01:00
parent ca79ba8291 094f7aa20e
commit 7df05c7d6d
3 changed files with 141 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -16,25 +16,17 @@
package org.springframework.boot.autoconfigure.cache;
import java.io.Closeable;
import java.io.IOException;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.spring.cache.HazelcastCacheManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration;
import org.springframework.boot.autoconfigure.hazelcast.HazelcastConfigResourceCondition;
import org.springframework.boot.autoconfigure.hazelcast.HazelcastInstanceFactory;
import org.springframework.cache.CacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
import org.springframework.context.annotation.Import;
/**
* Hazelcast cache configuration. Can either reuse the {@link HazelcastInstance} that has
@ -49,84 +41,10 @@ import org.springframework.core.io.Resource;
* @see HazelcastConfigResourceCondition
*/
@Configuration
@ConditionalOnClass({ HazelcastInstance.class, HazelcastCacheManager.class })
@ConditionalOnClass({HazelcastInstance.class, HazelcastCacheManager.class})
@ConditionalOnMissingBean(CacheManager.class)
@Conditional(CacheCondition.class)
@Import({HazelcastInstanceConfiguration.Existing.class, HazelcastInstanceConfiguration.Specific.class})
class HazelcastCacheConfiguration {
@Configuration
@ConditionalOnSingleCandidate(HazelcastInstance.class)
static class ExistingHazelcastInstanceConfiguration {
@Autowired
private CacheProperties cacheProperties;
@Bean
public HazelcastCacheManager cacheManager(
HazelcastInstance existingHazelcastInstance) throws IOException {
Resource config = this.cacheProperties.getHazelcast().getConfig();
Resource location = this.cacheProperties.resolveConfigLocation(config);
if (location != null) {
HazelcastInstance cacheHazelcastInstance = new HazelcastInstanceFactory(
location).getHazelcastInstance();
return new CloseableHazelcastCacheManager(cacheHazelcastInstance);
}
return new HazelcastCacheManager(existingHazelcastInstance);
}
}
@Configuration
@ConditionalOnMissingBean(HazelcastInstance.class)
@Conditional(ConfigAvailableCondition.class)
static class DefaultHazelcastInstanceConfiguration {
@Autowired
private CacheProperties cacheProperties;
@Bean
public HazelcastInstance hazelcastInstance() throws IOException {
Resource config = this.cacheProperties.getHazelcast().getConfig();
Resource location = this.cacheProperties.resolveConfigLocation(config);
if (location != null) {
new HazelcastInstanceFactory(location).getHazelcastInstance();
}
return Hazelcast.newHazelcastInstance();
}
@Bean
public HazelcastCacheManager cacheManager() throws IOException {
return new HazelcastCacheManager(hazelcastInstance());
}
}
/**
* {@link HazelcastConfigResourceCondition} that checks if the
* {@code spring.cache.hazelcast.config} configuration key is defined.
*/
static class ConfigAvailableCondition extends HazelcastConfigResourceCondition {
ConfigAvailableCondition() {
super("spring.cache.hazelcast", "config");
}
}
private static class CloseableHazelcastCacheManager extends HazelcastCacheManager
implements Closeable {
private final HazelcastInstance hazelcastInstance;
CloseableHazelcastCacheManager(HazelcastInstance hazelcastInstance) {
super(hazelcastInstance);
this.hazelcastInstance = hazelcastInstance;
}
@Override
public void close() throws IOException {
this.hazelcastInstance.shutdown();
}
}
}

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

@ -0,0 +1,120 @@
/*
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.autoconfigure.cache;
import java.io.Closeable;
import java.io.IOException;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.spring.cache.HazelcastCacheManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
import org.springframework.boot.autoconfigure.hazelcast.HazelcastConfigResourceCondition;
import org.springframework.boot.autoconfigure.hazelcast.HazelcastInstanceFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
/**
* Actual {@link HazelcastInstance} configurations imported by
* {@link HazelcastCacheConfiguration}.
*
* @author Stephane Nicoll
*/
abstract class HazelcastInstanceConfiguration {
@Configuration
@ConditionalOnSingleCandidate(HazelcastInstance.class)
static class Existing {
@Autowired
private CacheProperties cacheProperties;
@Bean
public HazelcastCacheManager cacheManager(
HazelcastInstance existingHazelcastInstance) throws IOException {
Resource config = this.cacheProperties.getHazelcast().getConfig();
Resource location = this.cacheProperties.resolveConfigLocation(config);
if (location != null) {
HazelcastInstance cacheHazelcastInstance = new HazelcastInstanceFactory(
location).getHazelcastInstance();
return new CloseableHazelcastCacheManager(cacheHazelcastInstance);
}
return new HazelcastCacheManager(existingHazelcastInstance);
}
}
@Configuration
@ConditionalOnMissingBean(HazelcastInstance.class)
@Conditional(ConfigAvailableCondition.class)
static class Specific {
@Autowired
private CacheProperties cacheProperties;
@Bean
public HazelcastInstance hazelcastInstance() throws IOException {
Resource config = this.cacheProperties.getHazelcast().getConfig();
Resource location = this.cacheProperties.resolveConfigLocation(config);
if (location != null) {
return new HazelcastInstanceFactory(location).getHazelcastInstance();
}
return Hazelcast.newHazelcastInstance();
}
@Bean
public HazelcastCacheManager cacheManager() throws IOException {
return new HazelcastCacheManager(hazelcastInstance());
}
}
/**
* {@link HazelcastConfigResourceCondition} that checks if the
* {@code spring.cache.hazelcast.config} configuration key is defined.
*/
static class ConfigAvailableCondition extends HazelcastConfigResourceCondition {
ConfigAvailableCondition() {
super("spring.cache.hazelcast", "config");
}
}
private static class CloseableHazelcastCacheManager extends HazelcastCacheManager
implements Closeable {
private final HazelcastInstance hazelcastInstance;
CloseableHazelcastCacheManager(HazelcastInstance hazelcastInstance) {
super(hazelcastInstance);
this.hazelcastInstance = hazelcastInstance;
}
@Override
public void close() throws IOException {
this.hazelcastInstance.shutdown();
}
}
}

26
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -326,16 +326,21 @@ public class CacheAutoConfigurationTests {
cacheManager.getCache("defaultCache");
assertThat(cacheManager.getCacheNames()).containsOnly("defaultCache");
assertThat(this.context.getBean(HazelcastInstance.class))
.isEqualTo(new DirectFieldAccessor(cacheManager)
.getPropertyValue("hazelcastInstance"));
.isEqualTo(getHazelcastInstance(cacheManager));
}
@Test
public void hazelcastCacheWithConfig() {
public void hazelcastCacheWithConfig() throws IOException {
load(DefaultCacheConfiguration.class, "spring.cache.type=hazelcast",
"spring.cache.hazelcast.config=org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml");
HazelcastInstance hazelcastInstance = this.context
.getBean(HazelcastInstance.class);
HazelcastCacheManager cacheManager = validateCacheManager(
HazelcastCacheManager.class);
HazelcastInstance actual = getHazelcastInstance(cacheManager);
assertThat(actual).isSameAs(hazelcastInstance);
assertThat(actual.getConfig().getConfigurationUrl()).isEqualTo(new ClassPathResource(
"org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml").getURL());
cacheManager.getCache("foobar");
assertThat(cacheManager.getCacheNames()).containsOnly("foobar");
}
@ -353,9 +358,8 @@ public class CacheAutoConfigurationTests {
load(HazelcastCustomHazelcastInstance.class, "spring.cache.type=hazelcast");
HazelcastCacheManager cacheManager = validateCacheManager(
HazelcastCacheManager.class);
assertThat(new DirectFieldAccessor(cacheManager)
.getPropertyValue("hazelcastInstance"))
.isEqualTo(this.context.getBean("customHazelcastInstance"));
assertThat(getHazelcastInstance(cacheManager))
.isEqualTo(this.context.getBean("customHazelcastInstance"));
}
@Test
@ -372,8 +376,7 @@ public class CacheAutoConfigurationTests {
HazelcastCacheManager.class);
HazelcastInstance hazelcastInstance = this.context
.getBean(HazelcastInstance.class);
assertThat(new DirectFieldAccessor(cacheManager)
.getPropertyValue("hazelcastInstance")).isEqualTo(hazelcastInstance);
assertThat(getHazelcastInstance(cacheManager)).isEqualTo(hazelcastInstance);
assertThat(hazelcastInstance.getConfig().getConfigurationFile())
.isEqualTo(new ClassPathResource(mainConfig).getFile());
}
@ -543,6 +546,11 @@ public class CacheAutoConfigurationTests {
this.context = applicationContext;
}
private static HazelcastInstance getHazelcastInstance(HazelcastCacheManager cacheManager) {
return (HazelcastInstance) new DirectFieldAccessor(cacheManager)
.getPropertyValue("hazelcastInstance");
}
@Configuration
static class EmptyConfiguration {