From 7191e658ab6092d2b78404640e0e6fb650161f25 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 12 Jan 2021 19:12:48 -0800 Subject: [PATCH] Re-instate Conditionals on the CloudFoundry and Kubernetes platforms. --- .../config/annotation/ClusterAvailableConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java index 947f82df..0eda1ceb 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java @@ -16,6 +16,8 @@ package org.springframework.geode.config.annotation; import org.springframework.boot.autoconfigure.condition.AnyNestedCondition; +import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; +import org.springframework.boot.cloud.CloudPlatform; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.data.gemfire.config.annotation.EnableClusterConfiguration; @@ -48,13 +50,11 @@ public class ClusterAvailableConfiguration { @Conditional(ClusterAvailableCondition.class) static class IsClusterAvailableCondition { } - /* @ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY) static class IsCloudFoundryEnvironmentCondition { } @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) static class IsKubernetesEnvironmentCondition { } - */ }