From 395c36a132f053500637c4f15d4985a44fd9a0b6 Mon Sep 17 00:00:00 2001 From: Anand Shah Date: Thu, 3 Mar 2016 21:27:46 +0000 Subject: [PATCH 1/2] Rename HealthIndicatorAutoConfigurationProperties Closes gh-5326 --- .../autoconfigure/HealthIndicatorAutoConfiguration.java | 4 ++-- ...gurationProperties.java => HealthIndicatorProperties.java} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/{HealthIndicatorAutoConfigurationProperties.java => HealthIndicatorProperties.java} (95%) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java index cc4f5597173..3b81cb50b89 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java @@ -100,11 +100,11 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; RabbitAutoConfiguration.class, SolrAutoConfiguration.class, MailSenderAutoConfiguration.class, JmsAutoConfiguration.class, ElasticsearchAutoConfiguration.class }) -@EnableConfigurationProperties({ HealthIndicatorAutoConfigurationProperties.class }) +@EnableConfigurationProperties({ HealthIndicatorProperties.class }) public class HealthIndicatorAutoConfiguration { @Autowired - private HealthIndicatorAutoConfigurationProperties configurationProperties = new HealthIndicatorAutoConfigurationProperties(); + private HealthIndicatorProperties configurationProperties = new HealthIndicatorProperties(); @Bean @ConditionalOnMissingBean(HealthAggregator.class) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java similarity index 95% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationProperties.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java index 03c31c400fd..af6178f4261 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 1.2.0 */ @ConfigurationProperties("management.health.status") -public class HealthIndicatorAutoConfigurationProperties { +public class HealthIndicatorProperties { /** * Comma-separated list of health statuses in order of severity. From aba9389b250e86b290def7654cb724e6b8e8f3b0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 4 Mar 2016 09:07:22 +0100 Subject: [PATCH 2/2] Polish contribution Closes gh-5328 --- .../autoconfigure/HealthIndicatorAutoConfiguration.java | 6 +++--- .../actuate/autoconfigure/HealthIndicatorProperties.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java index 3b81cb50b89..a7b080f0229 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java @@ -104,14 +104,14 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; public class HealthIndicatorAutoConfiguration { @Autowired - private HealthIndicatorProperties configurationProperties = new HealthIndicatorProperties(); + private HealthIndicatorProperties properties = new HealthIndicatorProperties(); @Bean @ConditionalOnMissingBean(HealthAggregator.class) public OrderedHealthAggregator healthAggregator() { OrderedHealthAggregator healthAggregator = new OrderedHealthAggregator(); - if (this.configurationProperties.getOrder() != null) { - healthAggregator.setStatusOrder(this.configurationProperties.getOrder()); + if (this.properties.getOrder() != null) { + healthAggregator.setStatusOrder(this.properties.getOrder()); } return healthAggregator; } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java index af6178f4261..6588038133b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2016 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.