Polish "Associate MeterConventions for JVM and system metrics"

See spring-projectsgh-47935

Author: snicoll

module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/jvm/JvmMetricsAutoConfigurationTests.java

@@ -32,7 +32,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
-import org.mockito.Mockito;
 
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
@@ -48,6 +47,7 @@
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link JvmMetricsAutoConfiguration}.
@@ -88,7 +88,7 @@ void allowsCustomJvmMemoryMetricsToBeUsed() {
 
 	@Test
 	void allowCustomJvmMemoryMeterConventionsToBeUsed() {
-		JvmMemoryMeterConventions jvmMemoryMeterConventions = Mockito.mock(JvmMemoryMeterConventions.class);
+		JvmMemoryMeterConventions jvmMemoryMeterConventions = mock(JvmMemoryMeterConventions.class);
 		this.contextRunner.withBean(JvmMemoryMeterConventions.class, () -> jvmMemoryMeterConventions)
 			.run((context) -> assertThat(context).hasSingleBean(JvmMemoryMetrics.class)
 				.getBean(JvmMemoryMetrics.class)
@@ -103,7 +103,7 @@ void allowsCustomJvmThreadMetricsToBeUsed() {
 
 	@Test
 	void allowCustomJvmThreadMeterConventionsToBeUsed() {
-		JvmThreadMeterConventions jvmThreadMeterConventions = Mockito.mock(JvmThreadMeterConventions.class);
+		JvmThreadMeterConventions jvmThreadMeterConventions = mock(JvmThreadMeterConventions.class);
 		this.contextRunner.withBean(JvmThreadMeterConventions.class, () -> jvmThreadMeterConventions)
 			.run((context) -> assertThat(context).hasSingleBean(JvmThreadMetrics.class)
 				.getBean(JvmThreadMetrics.class)
@@ -118,8 +118,7 @@ void allowsCustomClassLoaderMetricsToBeUsed() {
 
 	@Test
 	void allowCustomJvmClassLoadingMeterConventionsToBeUsed() {
-		JvmClassLoadingMeterConventions jvmClassLoadingMeterConventions = Mockito
-			.mock(JvmClassLoadingMeterConventions.class);
+		JvmClassLoadingMeterConventions jvmClassLoadingMeterConventions = mock(JvmClassLoadingMeterConventions.class);
 		this.contextRunner.withBean(JvmClassLoadingMeterConventions.class, () -> jvmClassLoadingMeterConventions)
 			.run((context) -> assertThat(context).hasSingleBean(ClassLoaderMetrics.class)
 				.getBean(ClassLoaderMetrics.class)

module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/system/SystemMetricsAutoConfigurationTests.java

@@ -27,7 +27,6 @@
 import io.micrometer.core.instrument.binder.system.UptimeMetrics;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.micrometer.metrics.system.DiskSpaceMetricsBinder;
@@ -36,6 +35,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link SystemMetricsAutoConfiguration}.
@@ -75,7 +75,7 @@ void allowsCustomProcessorMetricsToBeUsed() {
 
 	@Test
 	void allowsCustomJvmCpuMeterConventionsToBeUsed() {
-		JvmCpuMeterConventions jvmCpuMeterConventions = Mockito.mock(JvmCpuMeterConventions.class);
+		JvmCpuMeterConventions jvmCpuMeterConventions = mock(JvmCpuMeterConventions.class);
 		this.contextRunner.withBean(JvmCpuMeterConventions.class, () -> jvmCpuMeterConventions)
 			.run((context) -> assertThat(context).hasSingleBean(ProcessorMetrics.class)
 				.getBean(ProcessorMetrics.class)