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

Merge pull request #3962 from izeye/hazelcast 

* pr/3962:
  Remove duplicate `@ConditionalOnMissingBean` checks.
This commit is contained in:
Phillip Webb 2015-09-23 21:31:33 -07:00
parent 926b40e46c efb699de60
commit a63ec53d2b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java
View File

@ -49,7 +49,7 @@ import com.hazelcast.core.HazelcastInstance;
public class HazelcastAutoConfiguration {
@Configuration
@ConditionalOnMissingBean({ HazelcastInstance.class, Config.class })
@ConditionalOnMissingBean(Config.class)
@Conditional(ConfigAvailableCondition.class)
static class HazelcastConfigFileConfiguration {
@ -57,7 +57,6 @@ public class HazelcastAutoConfiguration {
private HazelcastProperties hazelcastProperties;
@Bean
@ConditionalOnMissingBean
public HazelcastInstance hazelcastInstance() throws IOException {
Resource config = this.hazelcastProperties.resolveConfigLocation();
if (config != null) {
@ -69,7 +68,6 @@ public class HazelcastAutoConfiguration {
}
@Configuration
@ConditionalOnMissingBean(HazelcastInstance.class)
@ConditionalOnSingleCandidate(Config.class)
static class HazelcastConfigConfiguration {