Remove `spring.cloud.enabled` property

This commit removes an undocumented property and rename the Spring
Cloud Service Connectors auto-configuration.

Closes gh-14219

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -20,7 +20,6 @@ import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.Cloud;
 import org.springframework.cloud.app.ApplicationInstanceInfo;
 import org.springframework.cloud.config.java.CloudScan;
@@ -31,28 +30,26 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.core.Ordered;
 
 /**
- * {@link EnableAutoConfiguration Auto-configuration} for Spring Cloud.
+ * {@link EnableAutoConfiguration Auto-configuration} for Spring Cloud Service Connectors.
  * <p>
- * Activates when there is no bean of type {@link Cloud} is configured in the context, the
- * {@link Cloud} type (this spring-cloud) is on the classpath, and the "cloud" profile is
+ * Activates when there is no bean of type {@link Cloud} and the "cloud" profile is
  * active.
  * <p>
  * Once in effect, the auto-configuration is the equivalent of adding the
  * {@link CloudScan} annotation in one of the configuration file. Specifically, it adds a
  * bean for each service bound to the application and one for
- * {@link ApplicationInstanceInfo}
+ * {@link ApplicationInstanceInfo}.
  *
  * @author Ramnivas Laddad
  * @since 1.2.0
  */
 @Configuration
 @Profile("cloud")
-@AutoConfigureOrder(CloudAutoConfiguration.ORDER)
+@AutoConfigureOrder(CloudServiceConnectorsAutoConfiguration.ORDER)
 @ConditionalOnClass(CloudScanConfiguration.class)
 @ConditionalOnMissingBean(Cloud.class)
-@ConditionalOnProperty(prefix = "spring.cloud", name = "enabled", havingValue = "true", matchIfMissing = true)
 @Import(CloudScanConfiguration.class)
-public class CloudAutoConfiguration {
+public class CloudServiceConnectorsAutoConfiguration {
 
 	// Cloud configuration needs to happen early (before data, mongo etc.)
 	public static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 20;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cloud/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for Spring Cloud Connectors.
+ * Auto-configuration for Spring Cloud Service Connectors.
  */
 package org.springframework.boot.autoconfigure.cloud;

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -27,7 +27,7 @@ org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration,\
 org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration,\
 org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration,\
 org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration,\
-org.springframework.boot.autoconfigure.cloud.CloudAutoConfiguration,\
+org.springframework.boot.autoconfigure.cloud.CloudServiceConnectorsAutoConfiguration,\
 org.springframework.boot.autoconfigure.context.ConfigurationPropertiesAutoConfiguration,\
 org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration,\
 org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration,\

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cloud/CloudServiceConnectorsAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -32,11 +32,11 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CloudAutoConfiguration}.
+ * Tests for {@link CloudServiceConnectorsAutoConfiguration}.
  *
  * @author Phillip Webb
  */
-public class CloudAutoConfigurationTests {
+public class CloudServiceConnectorsAutoConfigurationTests {
 
 	@Test
 	public void testOrder() {
@@ -47,9 +47,10 @@ public class CloudAutoConfigurationTests {
 		classNames.add(DataSourceAutoConfiguration.class.getName());
 		classNames.add(MongoRepositoriesAutoConfiguration.class.getName());
 		classNames.add(JpaRepositoriesAutoConfiguration.class.getName());
-		classNames.add(CloudAutoConfiguration.class.getName());
+		classNames.add(CloudServiceConnectorsAutoConfiguration.class.getName());
 		List<String> ordered = sorter.getInPriorityOrder(classNames);
-		assertThat(ordered.get(0)).isEqualTo(CloudAutoConfiguration.class.getName());
+		assertThat(ordered.get(0))
+				.isEqualTo(CloudServiceConnectorsAutoConfiguration.class.getName());
 	}
 
 }