Polish micrometer rc.5 upgrade

Closes gh-11071

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterBindersConfiguration.java

@@ -37,29 +37,29 @@
 class MeterBindersConfiguration {
 
 	@Bean
-	@ConditionalOnProperty(value = "spring.metrics.binders.jvmmemory.enabled", havingValue = "true", matchIfMissing = true)
+	@ConditionalOnProperty(value = "spring.metrics.binders.jvmmemory.enabled", matchIfMissing = true)
 	@ConditionalOnMissingBean(JvmMemoryMetrics.class)
 	public JvmMemoryMetrics jvmMemoryMetrics() {
 		return new JvmMemoryMetrics();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(LogbackMetrics.class)
-	@ConditionalOnProperty(value = "spring.metrics.binders.logback.enabled", havingValue = "true", matchIfMissing = true)
+	@ConditionalOnProperty(value = "spring.metrics.binders.logback.enabled", matchIfMissing = true)
 	@ConditionalOnClass(name = "ch.qos.logback.classic.Logger")
 	public LogbackMetrics logbackMetrics() {
 		return new LogbackMetrics();
 	}
 
 	@Bean
-	@ConditionalOnProperty(value = "spring.metrics.binders.uptime.enabled", havingValue = "true", matchIfMissing = true)
+	@ConditionalOnProperty(value = "spring.metrics.binders.uptime.enabled", matchIfMissing = true)
 	@ConditionalOnMissingBean(UptimeMetrics.class)
 	public UptimeMetrics uptimeMetrics() {
 		return new UptimeMetrics();
 	}
 
 	@Bean
-	@ConditionalOnProperty(value = "spring.metrics.binders.processor.enabled", havingValue = "true", matchIfMissing = true)
+	@ConditionalOnProperty(value = "spring.metrics.binders.processor.enabled", matchIfMissing = true)
 	@ConditionalOnMissingBean(ProcessorMetrics.class)
 	public ProcessorMetrics processorMetrics() {
 		return new ProcessorMetrics();

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java

@@ -43,6 +43,9 @@ public class SimpleProperties {
 	 */
 	private Duration step = Duration.ofSeconds(10);
 
+	/**
+	 * Counting mode.
+	 */
 	private CountingMode mode = CountingMode.Cumulative;
 
 	public boolean getEnabled() {
@@ -62,10 +65,11 @@ public void setStep(Duration step) {
 	}
 
 	public CountingMode getMode() {
-		return mode;
+		return this.mode;
 	}
 
 	public void setMode(CountingMode mode) {
 		this.mode = mode;
 	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimplePropertiesConfigAdapter.java

@@ -55,4 +55,5 @@ public Duration step() {
 	public CountingMode mode() {
 		return get(SimpleProperties::getMode, SimpleConfig.super::mode);
 	}
+
 }