SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Spring Boot 1.3, stage I (make it compile)

Browse Source
This commit is contained in:
Dave Syer
2015-07-03 09:54:14 +01:00
parent daf2b8f2f7
commit c55c6117ab
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
View File

@@ -20,6 +20,7 @@ import java.util.List;
import org.springframework.boot.actuate.health.HealthAggregator;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -30,7 +31,6 @@ import org.springframework.cloud.client.discovery.health.DiscoveryCompositeHealt
import org.springframework.cloud.client.discovery.health.DiscoveryHealthIndicator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
/**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Cloud Commons Client.
@@ -41,17 +41,17 @@ import org.springframework.core.annotation.Order;
@ConditionalOnClass(HealthIndicator.class)
@ConditionalOnBean(DiscoveryClient.class)
@ConditionalOnProperty(value = "spring.cloud.discovery.enabled", matchIfMissing = true)
@Order(0)
@AutoConfigureOrder(0)
public class CommonsClientAutoConfiguration {
@Bean
public DiscoveryClientHealthIndicator instancesHealthIndicator(
public DiscoveryClientHealthIndicator discoveryClientHealthIndicator(
DiscoveryClient discoveryClient) {
return new DiscoveryClientHealthIndicator(discoveryClient);
}
@Bean
public DiscoveryCompositeHealthIndicator discoveryHealthIndicator(
public DiscoveryCompositeHealthIndicator discoveryCompositeHealthIndicator(
HealthAggregator aggregator, List<DiscoveryHealthIndicator> indicators) {
return new DiscoveryCompositeHealthIndicator(aggregator, indicators);
}

9
spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java
View File

@@ -26,6 +26,7 @@ import java.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthAggregator;
import org.springframework.boot.actuate.health.OrderedHealthAggregator;
@@ -77,7 +78,7 @@ public class DiscoveryCompositeHealthIndicatorTests {
@Override
public Health health() {
return new Health.Builder().up().build();
return new Health.Builder().unknown().build();
}
};
}
@@ -89,7 +90,7 @@ public class DiscoveryCompositeHealthIndicatorTests {
Health health = this.healthIndicator.health();
assertHealth(health, Status.UNKNOWN);
clientHealthIndicator.onApplicationEvent(new InstanceRegisteredEvent(this, null));
clientHealthIndicator.onApplicationEvent(new InstanceRegisteredEvent<Object>(this, null));
health = this.healthIndicator.health();
Status status = assertHealth(health, Status.UP);
@@ -104,5 +105,9 @@ public class DiscoveryCompositeHealthIndicatorTests {
assertEquals("status code was wrong", expected.getCode(), status.getCode());
return status;
}
public static void main(String[] args) {
SpringApplication.run(new Object[]{Config.class,CommonsClientAutoConfiguration.class}, new String[] {"--debug", "--spring.main.webEnvironment=false"});
}
}

3
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java
View File

@@ -29,6 +29,7 @@ import org.springframework.boot.bind.RelaxedDataBinder;
import org.springframework.boot.context.properties.ConfigurationPropertiesBindingPostProcessor;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.logging.LogFile;
import org.springframework.boot.logging.LoggingInitializationContext;
import org.springframework.boot.logging.LoggingSystem;
import org.springframework.cloud.bootstrap.BootstrapApplicationListener;
import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
@@ -111,7 +112,7 @@ public class PropertySourceBootstrapConfiguration implements
try {
ResourceUtils.getURL(logConfig).openStream().close();
LogFile logFile = LogFile.get(environment);
system.initialize(logConfig, logFile);
system.initialize(new LoggingInitializationContext(environment), logConfig, logFile);
}
catch (Exception ex) {
PropertySourceBootstrapConfiguration.logger