From 04cd54d2edb4e9a7f17d7508db4ff41791eb7a1c Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 3 Dec 2019 13:15:11 +0900 Subject: [PATCH] Clean up compile warnings in 1.3.x branch --- .../cloudwatch/CloudWatchMeterRegistryCompatibilityTest.java | 1 + .../io/micrometer/cloudwatch/CloudWatchMeterRegistryTest.java | 2 ++ .../java/io/micrometer/cloudwatch/CloudWatchUtilsTest.java | 1 + .../io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java | 4 +++- .../micrometer/cloudwatch2/CloudWatchMeterRegistryTest.java | 1 + .../httpcomponents/MicrometerHttpRequestExecutorTest.java | 2 +- 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryCompatibilityTest.java b/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryCompatibilityTest.java index 44592b7f7e..915dea94a4 100644 --- a/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryCompatibilityTest.java +++ b/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryCompatibilityTest.java @@ -22,6 +22,7 @@ import java.time.Duration; +@SuppressWarnings("deprecation") class CloudWatchMeterRegistryCompatibilityTest extends MeterRegistryCompatibilityKit { private final CloudWatchConfig config = new CloudWatchConfig() { diff --git a/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryTest.java b/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryTest.java index 4b81bdf6fd..6314872cde 100644 --- a/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryTest.java +++ b/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryTest.java @@ -41,6 +41,7 @@ * * @author Johnny Lim */ +@SuppressWarnings("deprecation") class CloudWatchMeterRegistryTest { private static final String METER_NAME = "test"; private final CloudWatchConfig config = new CloudWatchConfig() { @@ -213,6 +214,7 @@ public void batchSizeShouldWorkOnMetricDatum() throws InterruptedException { when(this.registry.getMeters()).thenReturn(meters); doNothing().when(this.registry).sendMetricData(any()); this.registry.publish(); + @SuppressWarnings("unchecked") ArgumentCaptor> argumentCaptor = ArgumentCaptor.forClass(List.class); verify(this.registry, times(2)).sendMetricData(argumentCaptor.capture()); List> allValues = argumentCaptor.getAllValues(); diff --git a/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchUtilsTest.java b/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchUtilsTest.java index 9c3e0dd5d6..85b52e3919 100644 --- a/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchUtilsTest.java +++ b/implementations/micrometer-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchUtilsTest.java @@ -22,6 +22,7 @@ /** * Test methods in CloudWatchUtils */ +@SuppressWarnings("deprecation") class CloudWatchUtilsTest { private static final double EXPECTED_MIN = 8.515920e-109; diff --git a/implementations/micrometer-registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java b/implementations/micrometer-registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java index 9d68a7f44b..47e13e5cd2 100644 --- a/implementations/micrometer-registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java +++ b/implementations/micrometer-registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java @@ -138,7 +138,9 @@ void sendMetricData(List metricData) throws InterruptedException { latch.countDown(); }); try { - latch.await(config.readTimeout().toMillis(), TimeUnit.MILLISECONDS); + @SuppressWarnings("deprecation") + long readTimeoutMillis = config.readTimeout().toMillis(); + latch.await(readTimeoutMillis, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { logger.warn("metrics push to cloudwatch took longer than expected"); throw e; diff --git a/implementations/micrometer-registry-cloudwatch2/src/test/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistryTest.java b/implementations/micrometer-registry-cloudwatch2/src/test/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistryTest.java index 699378d7ee..058d840443 100644 --- a/implementations/micrometer-registry-cloudwatch2/src/test/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistryTest.java +++ b/implementations/micrometer-registry-cloudwatch2/src/test/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistryTest.java @@ -214,6 +214,7 @@ void batchSizeShouldWorkOnMetricDatum() throws InterruptedException { when(this.registry.getMeters()).thenReturn(meters); doNothing().when(this.registry).sendMetricData(any()); this.registry.publish(); + @SuppressWarnings("unchecked") ArgumentCaptor> argumentCaptor = ArgumentCaptor.forClass(List.class); verify(this.registry, times(2)).sendMetricData(argumentCaptor.capture()); List> allValues = argumentCaptor.getAllValues(); diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutorTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutorTest.java index fe6b432d26..bd2fd4126b 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutorTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutorTest.java @@ -39,7 +39,7 @@ import java.util.stream.Collectors; import static com.github.tomakehurst.wiremock.client.WireMock.*; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; /**