Refactor Cluster-aware Conditions to be CloudFoundry Environment-aware.

Resolves gh-56.

spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java

@@ -15,6 +15,9 @@
  */
 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;
@@ -24,16 +27,34 @@ import org.springframework.data.gemfire.config.annotation.EnableClusterConfigura
  * configuration when an Apache Geode or Pivotal GemFire cluster of servers are available.
  *
  * @author John Blum
+ * @see org.springframework.boot.autoconfigure.condition.AnyNestedCondition
+ * @see org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform
+ * @see org.springframework.boot.cloud.CloudPlatform
  * @see org.springframework.context.annotation.Conditional
  * @see org.springframework.context.annotation.Configuration
  * @see org.springframework.data.gemfire.config.annotation.EnableClusterConfiguration
  * @since 1.2.0
  */
 @Configuration
-@Conditional(ClusterAvailableConfiguration.ClusterAvailableCondition.class)
+@Conditional(ClusterAvailableConfiguration.AnyClusterAvailableCondition.class)
 @EnableClusterConfiguration(requireHttps = false, useHttp = true)
+@SuppressWarnings("unused")
 public class ClusterAvailableConfiguration {
 
+	public static final class AnyClusterAvailableCondition extends AnyNestedCondition {
+
+		public AnyClusterAvailableCondition() {
+			super(ConfigurationPhase.PARSE_CONFIGURATION);
+		}
+
+		@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
+		static class IsCloudFoundryEnvironmentCondition { }
+
+		@Conditional(ClusterAvailableCondition.class)
+		static class IsClusterAvailableCondition { }
+
+	}
+
 	public static final class ClusterAvailableCondition extends ClusterAwareConfiguration.ClusterAwareCondition { }
 
 }

spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java

@@ -22,7 +22,10 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
+import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
@@ -38,6 +41,8 @@ import org.springframework.lang.Nullable;
  *
  * @author John Blum
  * @see org.springframework.beans.factory.config.BeanPostProcessor
+ * @see org.springframework.boot.autoconfigure.condition.AllNestedConditions
+ * @see org.springframework.boot.cloud.CloudPlatform
  * @see org.springframework.context.annotation.Bean
  * @see org.springframework.context.annotation.Conditional
  * @see org.springframework.context.annotation.Configuration
@@ -47,7 +52,7 @@ import org.springframework.lang.Nullable;
  * @since 1.2.0
  */
 @Configuration
-@Conditional(ClusterNotAvailableConfiguration.CusterNotAvailableCondition.class)
+@Conditional(ClusterNotAvailableConfiguration.AllClusterNotAvailableConditions.class)
 @SuppressWarnings("unused")
 public class ClusterNotAvailableConfiguration {
 
@@ -97,11 +102,33 @@ public class ClusterNotAvailableConfiguration {
 		return clientRegion;
 	}
 
-	public static final class CusterNotAvailableCondition extends ClusterAwareConfiguration.ClusterAwareCondition {
+	public static final class AllClusterNotAvailableConditions extends AllNestedConditions {
+
+		public AllClusterNotAvailableConditions() {
+			super(ConfigurationPhase.PARSE_CONFIGURATION);
+		}
+
+		@Conditional(ClusterNotAvailableCondition.class)
+		static class IsClusterNotAvailableCondition { }
+
+		@Conditional(NotCloudFoundryEnvironmentCondition.class)
+		static class IsNotCloudFoundryEnvironmentCondition { }
+
+	}
+
+	public static final class ClusterNotAvailableCondition extends ClusterAwareConfiguration.ClusterAwareCondition {
 
 		@Override
 		public synchronized boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
 			return !super.matches(context, metadata);
 		}
 	}
+
+	public static final class NotCloudFoundryEnvironmentCondition implements Condition {
+
+		@Override
+		public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+			return !CloudPlatform.CLOUD_FOUNDRY.isActive(context.getEnvironment());
+		}
+	}
 }