Merge branch '2.2.x'

spring-cloud-config-server/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-config</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>2.2.7.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -40,6 +40,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/composite/CompositeEnvironmentBeanFactoryPostProcessor.java

@@ -45,8 +45,11 @@ public class CompositeEnvironmentBeanFactoryPostProcessor implements BeanFactory
 		this.environment = environment;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+		BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
+
 		List<String> typePropertyList = CompositeUtils.getCompositeTypeList(this.environment);
 		for (int i = 0; i < typePropertyList.size(); i++) {
 			String type = typePropertyList.get(i);
@@ -56,12 +59,18 @@ public class CompositeEnvironmentBeanFactoryPostProcessor implements BeanFactory
 			Class<? extends EnvironmentRepositoryProperties> propertiesClass;
 			propertiesClass = (Class<? extends EnvironmentRepositoryProperties>) factoryTypes[1];
 			EnvironmentRepositoryProperties properties = bindProperties(i, propertiesClass, this.environment);
+			AbstractBeanDefinition propertiesDefinition = BeanDefinitionBuilder
+					.genericBeanDefinition(EnvironmentRepositoryProperties.class,
+							() -> properties)
+					.getBeanDefinition();
+			String propertiesBeanName = String.format("%s-env-repo-properties%d", type,
+					i);
+			registry.registerBeanDefinition(propertiesBeanName, propertiesDefinition);
 
 			AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder
 					.genericBeanDefinition(EnvironmentRepository.class).setFactoryMethodOnBean("build", factoryName)
 					.addConstructorArgValue(properties).getBeanDefinition();
 			String beanName = String.format("%s-env-repo%d", type, i);
-			BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
 			registry.registerBeanDefinition(beanName, beanDefinition);
 		}
 	}

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java

@@ -27,6 +27,7 @@ import org.eclipse.jgit.api.TransportConfigCallback;
 import org.tmatesoft.svn.core.SVNException;
 
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.actuate.health.AbstractHealthIndicator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -107,12 +108,6 @@ import org.springframework.vault.core.VaultTemplate;
 		AwsS3RepositoryConfiguration.class, DefaultRepositoryConfiguration.class })
 public class EnvironmentRepositoryConfiguration {
 
-	@Bean
-	@ConditionalOnProperty(value = "spring.cloud.config.server.health.enabled", matchIfMissing = true)
-	public ConfigServerHealthIndicator configServerHealthIndicator(EnvironmentRepository repository) {
-		return new ConfigServerHealthIndicator(repository);
-	}
-
 	@Bean
 	@ConditionalOnMissingBean(search = SearchStrategy.CURRENT)
 	public MultipleJGitEnvironmentProperties multipleJGitEnvironmentProperties() {
@@ -125,6 +120,20 @@ public class EnvironmentRepositoryConfiguration {
 		return new HttpRequestConfigTokenProvider(httpRequest);
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(AbstractHealthIndicator.class)
+	@ConditionalOnProperty(value = "spring.cloud.config.server.health.enabled",
+			matchIfMissing = true)
+	protected static class ConfigServerActuatorConfiguration {
+
+		@Bean
+		public ConfigServerHealthIndicator configServerHealthIndicator(
+				EnvironmentRepository repository) {
+			return new ConfigServerHealthIndicator(repository);
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty("spring.cloud.config.server.consul.watch.enabled")
 	protected static class ConsulEnvironmentWatchConfiguration {

spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/authentication/PcfClientAuthenticationProvider.java

@@ -52,6 +52,10 @@ public class PcfClientAuthenticationProvider extends SpringVaultClientAuthentica
 		else {
 			builder.instanceCertificate(new ResourceCredentialSupplier(resolveEnvVariable("CF_INSTANCE_CERT")));
 		}
+		else {
+			builder.instanceCertificate(new ResourceCredentialSupplier(
+					resolveEnvVariable("CF_INSTANCE_CERT")));
+		}
 
 		if (pcfProperties.getInstanceKey() != null) {
 			builder.instanceKey(new ResourceCredentialSupplier(pcfProperties.getInstanceKey()));
@@ -59,6 +63,10 @@ public class PcfClientAuthenticationProvider extends SpringVaultClientAuthentica
 		else {
 			builder.instanceKey(new ResourceCredentialSupplier(resolveEnvVariable("CF_INSTANCE_KEY")));
 		}
+		else {
+			builder.instanceKey(new ResourceCredentialSupplier(
+					resolveEnvVariable("CF_INSTANCE_KEY")));
+		}
 
 		return new PcfAuthentication(builder.build(), vaultRestOperations);
 	}

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/CompositeClasspathTests.java

@@ -24,6 +24,8 @@ import org.springframework.cloud.config.server.composite.CompositeUtils;
 import org.springframework.cloud.test.ClassPathExclusions;
 import org.springframework.cloud.test.ModifiedClassPathRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class CompositeClasspathTests {
 
 	@RunWith(ModifiedClassPathRunner.class)
@@ -46,6 +48,29 @@ public class CompositeClasspathTests {
 
 	}
 
+	@RunWith(ModifiedClassPathRunner.class)
+	@ClassPathExclusions({ "spring-jdbc-*.jar", "spring-data-redis-*.jar",
+			"spring-boot-actuator-*.jar" })
+	public static class NoActuatorTests {
+
+		@Test
+		public void contextLoads() {
+			new WebApplicationContextRunner()
+					.withUserConfiguration(ConfigServerApplication.class)
+					.withPropertyValues("spring.profiles.active:test,composite",
+							"spring.jmx.enabled=false",
+							"spring.config.name:compositeconfigserver",
+							"spring.cloud.config.server.composite[0].uri:file:./target/repos/config-repo",
+							"spring.cloud.config.server.composite[0].type:git")
+					.run(context -> {
+						CompositeUtils.getCompositeTypeList(context.getEnvironment());
+						assertThat(context)
+								.doesNotHaveBean("configServerHealthIndicator");
+					});
+		}
+
+	}
+
 	@RunWith(ModifiedClassPathRunner.class)
 	@ClassPathExclusions("httpclient-*.jar")
 	public static class HttpClientTests {