diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java index 353a39fa9cb..280c093ee88 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java @@ -21,6 +21,7 @@ import com.hazelcast.core.HazelcastInstance; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -35,6 +36,7 @@ import org.springframework.context.annotation.Import; * @see HazelcastConfigResourceCondition */ @Configuration(proxyBeanMethods = false) +@Conditional(HazelcastJetConfigMissingCondition.class) @ConditionalOnClass(HazelcastInstance.class) @EnableConfigurationProperties(HazelcastProperties.class) @Import({ HazelcastClientConfiguration.class, HazelcastServerConfiguration.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJetConfigMissingCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJetConfigMissingCondition.java new file mode 100644 index 00000000000..854f67eea2b --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJetConfigMissingCondition.java @@ -0,0 +1,44 @@ +/* + * Copyright 2012-2019 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 + * + * https://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.hazelcast; + +import org.springframework.boot.autoconfigure.condition.ConditionOutcome; +import org.springframework.boot.autoconfigure.condition.SpringBootCondition; +import org.springframework.context.annotation.ConditionContext; +import org.springframework.core.io.Resource; +import org.springframework.core.type.AnnotatedTypeMetadata; + +/** + * {@link SpringBootCondition} that checks if the Hazelcast Jet is missing on the + * classpath by looking up the default configuration file. + * + * @author Ali Gurbuz + * @since 2.3.0 + */ +public class HazelcastJetConfigMissingCondition extends SpringBootCondition { + + private static final String HAZELCAST_JET_CONFIG_FILE = "classpath:/hazelcast-jet-default.yaml"; + + public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { + Resource resource = context.getResourceLoader().getResource(HAZELCAST_JET_CONFIG_FILE); + if (resource.exists()) { + return ConditionOutcome.noMatch("Found Hazelcast Jet default config file on the classpath"); + } + return ConditionOutcome.match("Hazelcast Jet default config file is missing on the classpath"); + } + +} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java index f389c683a7c..9a4c47b926d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java @@ -16,8 +16,12 @@ package org.springframework.boot.autoconfigure.hazelcast; +import java.net.MalformedURLException; +import java.net.URL; + import com.hazelcast.config.Config; import com.hazelcast.core.HazelcastInstance; +import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -47,4 +51,35 @@ class HazelcastAutoConfigurationTests { }); } + @Test + void testHazelcastInstanceNotCreatedWhenJetIsPresent() { + this.contextRunner.withClassLoader(new JetConfigClassLoader()) + .run((context) -> assertThat(context).doesNotHaveBean(HazelcastInstance.class)); + } + + /** + * A specific class loader which emulates that default Hazelcast Jet configuration + * file exists on the classpath. + */ + static class JetConfigClassLoader extends ClassLoader { + + JetConfigClassLoader() { + super(JetConfigClassLoader.class.getClassLoader()); + } + + @Nullable + @Override + public URL getResource(String name) { + if (name.equals("hazelcast-jet-default.yaml")) { + try { + return new URL("file://hazelcast-jet-default.yaml"); + } + catch (MalformedURLException ignored) { + } + } + return super.getResource(name); + } + + } + }