Merge pull request #31443 from izeye

* pr/31443:
  Static-import Mockito.mock()

Closes gh-31443

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/wavefront/WavefrontMetricsExportAutoConfigurationTests.java

@@ -21,7 +21,6 @@
 import io.micrometer.wavefront.WavefrontConfig;
 import io.micrometer.wavefront.WavefrontMeterRegistry;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -98,7 +97,7 @@ static class BaseConfiguration {
 
 		@Bean
 		WavefrontSender customWavefrontSender() {
-			return Mockito.mock(WavefrontSender.class);
+			return mock(WavefrontSender.class);
 		}
 
 		@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java

@@ -36,7 +36,6 @@
 import io.micrometer.tracing.handler.TracingObservationHandler;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
-import org.mockito.Mockito;
 
 import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -49,6 +48,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link ObservationAutoConfiguration}.
@@ -290,7 +290,7 @@ MeterObservationHandler<Context> customMeterObservationHandler1(CalledHandlers c
 
 	private static class CustomTracingObservationHandler implements TracingObservationHandler<Context> {
 
-		private final Tracer tracer = Mockito.mock(Tracer.class, Answers.RETURNS_MOCKS);
+		private final Tracer tracer = mock(Tracer.class, Answers.RETURNS_MOCKS);
 
 		private final String name;
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java

@@ -34,7 +34,6 @@
 import io.micrometer.tracing.brave.bridge.BraveTracer;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
-import org.mockito.Mockito;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.FilteredClassLoader;
@@ -43,6 +42,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link BraveAutoConfiguration}.
@@ -157,43 +157,43 @@ private static class CustomBraveConfiguration {
 
 		@Bean
 		Tracing customTracing() {
-			return Mockito.mock(Tracing.class);
+			return mock(Tracing.class);
 		}
 
 		@Bean
 		Tracer customTracer() {
-			return Mockito.mock(Tracer.class);
+			return mock(Tracer.class);
 		}
 
 		@Bean
 		CurrentTraceContext customCurrentTraceContext() {
-			return Mockito.mock(CurrentTraceContext.class);
+			return mock(CurrentTraceContext.class);
 		}
 
 		@Bean
 		Factory customFactory() {
-			return Mockito.mock(Factory.class);
+			return mock(Factory.class);
 		}
 
 		@Bean
 		Sampler customSampler() {
-			return Mockito.mock(Sampler.class);
+			return mock(Sampler.class);
 		}
 
 		@Bean
 		HttpTracing customHttpTracing() {
-			return Mockito.mock(HttpTracing.class);
+			return mock(HttpTracing.class);
 		}
 
 		@Bean
 		HttpServerHandler<HttpServerRequest, HttpServerResponse> customHttpServerHandler() {
-			HttpTracing httpTracing = Mockito.mock(HttpTracing.class, Answers.RETURNS_MOCKS);
+			HttpTracing httpTracing = mock(HttpTracing.class, Answers.RETURNS_MOCKS);
 			return HttpServerHandler.create(httpTracing);
 		}
 
 		@Bean
 		HttpClientHandler<HttpClientRequest, HttpClientResponse> customHttpClientHandler() {
-			HttpTracing httpTracing = Mockito.mock(HttpTracing.class, Answers.RETURNS_MOCKS);
+			HttpTracing httpTracing = mock(HttpTracing.class, Answers.RETURNS_MOCKS);
 			return HttpClientHandler.create(httpTracing);
 		}
 
@@ -204,22 +204,22 @@ private static class CustomMicrometerBraveConfiguration {
 
 		@Bean
 		BraveTracer customBraveTracer() {
-			return Mockito.mock(BraveTracer.class);
+			return mock(BraveTracer.class);
 		}
 
 		@Bean
 		BraveBaggageManager customBraveBaggageManager() {
-			return Mockito.mock(BraveBaggageManager.class);
+			return mock(BraveBaggageManager.class);
 		}
 
 		@Bean
 		BraveHttpServerHandler customBraveHttpServerHandler() {
-			return Mockito.mock(BraveHttpServerHandler.class);
+			return mock(BraveHttpServerHandler.class);
 		}
 
 		@Bean
 		BraveHttpClientHandler customBraveHttpClientHandler() {
-			return Mockito.mock(BraveHttpClientHandler.class);
+			return mock(BraveHttpClientHandler.class);
 		}
 
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfigurationTests.java

@@ -26,7 +26,6 @@
 import io.micrometer.tracing.http.HttpClientHandler;
 import io.micrometer.tracing.http.HttpServerHandler;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.FilteredClassLoader;
@@ -35,6 +34,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link MicrometerTracingAutoConfiguration}.
@@ -133,7 +133,7 @@ private static class TracerConfiguration {
 
 		@Bean
 		Tracer tracer() {
-			return Mockito.mock(Tracer.class);
+			return mock(Tracer.class);
 		}
 
 	}
@@ -143,7 +143,7 @@ private static class HttpClientHandlerConfiguration {
 
 		@Bean
 		HttpClientHandler httpClientHandler() {
-			return Mockito.mock(HttpClientHandler.class);
+			return mock(HttpClientHandler.class);
 		}
 
 	}
@@ -153,7 +153,7 @@ private static class HttpServerHandlerConfiguration {
 
 		@Bean
 		HttpServerHandler httpServerHandler() {
-			return Mockito.mock(HttpServerHandler.class);
+			return mock(HttpServerHandler.class);
 		}
 
 	}
@@ -163,17 +163,17 @@ private static class CustomConfiguration {
 
 		@Bean
 		DefaultTracingObservationHandler customDefaultTracingObservationHandler() {
-			return Mockito.mock(DefaultTracingObservationHandler.class);
+			return mock(DefaultTracingObservationHandler.class);
 		}
 
 		@Bean
 		HttpServerTracingObservationHandler customHttpServerTracingObservationHandler() {
-			return Mockito.mock(HttpServerTracingObservationHandler.class);
+			return mock(HttpServerTracingObservationHandler.class);
 		}
 
 		@Bean
 		HttpClientTracingObservationHandler customHttpClientTracingObservationHandler() {
-			return Mockito.mock(HttpClientTracingObservationHandler.class);
+			return mock(HttpClientTracingObservationHandler.class);
 		}
 
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryConfigurationsMicrometerConfigurationTests.java

@@ -25,7 +25,6 @@
 import io.opentelemetry.api.trace.Tracer;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
-import org.mockito.Mockito;
 
 import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryConfigurations.MicrometerConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -35,6 +34,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link MicrometerConfiguration}.
@@ -104,27 +104,27 @@ private static class CustomConfiguration {
 
 		@Bean
 		OtelTracer customOtelTracer() {
-			return Mockito.mock(OtelTracer.class);
+			return mock(OtelTracer.class);
 		}
 
 		@Bean
 		EventPublisher customEventPublisher() {
-			return Mockito.mock(EventPublisher.class);
+			return mock(EventPublisher.class);
 		}
 
 		@Bean
 		OtelCurrentTraceContext customOtelCurrentTraceContext() {
-			return Mockito.mock(OtelCurrentTraceContext.class);
+			return mock(OtelCurrentTraceContext.class);
 		}
 
 		@Bean
 		OtelHttpClientHandler customOtelHttpClientHandler() {
-			return Mockito.mock(OtelHttpClientHandler.class);
+			return mock(OtelHttpClientHandler.class);
 		}
 
 		@Bean
 		OtelHttpServerHandler customOtelHttpServerHandler() {
-			return Mockito.mock(OtelHttpServerHandler.class);
+			return mock(OtelHttpServerHandler.class);
 		}
 
 	}
@@ -134,7 +134,7 @@ private static class TracerConfiguration {
 
 		@Bean
 		Tracer tracer() {
-			return Mockito.mock(Tracer.class);
+			return mock(Tracer.class);
 		}
 
 	}
@@ -144,7 +144,7 @@ private static class OpenTelemetryConfiguration {
 
 		@Bean
 		OpenTelemetry openTelemetry() {
-			return Mockito.mock(OpenTelemetry.class, Answers.RETURNS_MOCKS);
+			return mock(OpenTelemetry.class, Answers.RETURNS_MOCKS);
 		}
 
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryConfigurationsSdkConfigurationTests.java

@@ -22,7 +22,6 @@
 import io.opentelemetry.sdk.trace.SpanProcessor;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryConfigurations.SdkConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -31,6 +30,7 @@
 import org.springframework.context.annotation.Bean;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link SdkConfiguration}.
@@ -84,7 +84,7 @@ private static class CustomBeans {
 
 		@Bean
 		OpenTelemetry customOpenTelemetry() {
-			return Mockito.mock(OpenTelemetry.class);
+			return mock(OpenTelemetry.class);
 		}
 
 		@Bean
@@ -94,17 +94,17 @@ SdkTracerProvider customSdkTracerProvider() {
 
 		@Bean
 		ContextPropagators customContextPropagators() {
-			return Mockito.mock(ContextPropagators.class);
+			return mock(ContextPropagators.class);
 		}
 
 		@Bean
 		Sampler customSampler() {
-			return Mockito.mock(Sampler.class);
+			return mock(Sampler.class);
 		}
 
 		@Bean
 		SpanProcessor customSpanProcessor() {
-			return Mockito.mock(SpanProcessor.class);
+			return mock(SpanProcessor.class);
 		}
 
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryConfigurationsTracerConfigurationTests.java

@@ -19,7 +19,6 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryConfigurations.TracerConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -29,6 +28,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link TracerConfiguration}.
@@ -71,7 +71,7 @@ private static class OpenTelemetryConfiguration {
 
 		@Bean
 		OpenTelemetry openTelemetry() {
-			return Mockito.mock(OpenTelemetry.class);
+			return mock(OpenTelemetry.class);
 		}
 
 	}
@@ -81,7 +81,7 @@ private static class CustomConfiguration {
 
 		@Bean
 		Tracer customTracer() {
-			return Mockito.mock(Tracer.class);
+			return mock(Tracer.class);
 		}
 
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfigurationTests.java

@@ -25,7 +25,6 @@
 import io.micrometer.tracing.reporter.wavefront.WavefrontOtelSpanHandler;
 import io.micrometer.tracing.reporter.wavefront.WavefrontSpanHandler;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.FilteredClassLoader;
@@ -156,27 +155,27 @@ private static class CustomConfiguration {
 
 		@Bean
 		ApplicationTags customApplicationTags() {
-			return Mockito.mock(ApplicationTags.class);
+			return mock(ApplicationTags.class);
 		}
 
 		@Bean
 		WavefrontSpanHandler customWavefrontSpanHandler() {
-			return Mockito.mock(WavefrontSpanHandler.class);
+			return mock(WavefrontSpanHandler.class);
 		}
 
 		@Bean
 		SpanMetrics customSpanMetrics() {
-			return Mockito.mock(SpanMetrics.class);
+			return mock(SpanMetrics.class);
 		}
 
 		@Bean
 		WavefrontBraveSpanHandler customWavefrontBraveSpanHandler() {
-			return Mockito.mock(WavefrontBraveSpanHandler.class);
+			return mock(WavefrontBraveSpanHandler.class);
 		}
 
 		@Bean
 		WavefrontOtelSpanHandler customWavefrontOtelSpanHandler() {
-			return Mockito.mock(WavefrontOtelSpanHandler.class);
+			return mock(WavefrontOtelSpanHandler.class);
 		}
 
 	}