From 28d2955d0346a1b349ff9d986b409e7a3c067bb0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 1 Jun 2015 15:08:59 +0200 Subject: [PATCH] Fix Hazelcast cache statistics condition Make sure the Hazelcast statistics support is not triggered if the Spring support is not present. The Hazelcast dependency alone may be used with JCache and this should not trigger the support of the native Hazelcast metrics infra. See gh-2633 --- .../autoconfigure/CacheStatisticsAutoConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java index 904d988957..4719ea719d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java @@ -18,6 +18,8 @@ package org.springframework.boot.actuate.autoconfigure; import javax.cache.Caching; +import com.hazelcast.core.IMap; +import com.hazelcast.spring.cache.HazelcastCache; import net.sf.ehcache.Ehcache; import org.springframework.boot.actuate.cache.CacheStatistics; @@ -41,8 +43,6 @@ import org.springframework.cache.support.NoOpCacheManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.hazelcast.core.IMap; - /** * {@link EnableAutoConfiguration Auto-configuration} for {@link CacheStatisticsProvider} * beans. @@ -79,7 +79,7 @@ public class CacheStatisticsAutoConfiguration { } @Configuration - @ConditionalOnClass(IMap.class) + @ConditionalOnClass({ IMap.class, HazelcastCache.class} ) static class HazelcastCacheStatisticsConfiguration { @Bean