Clean up compile warnings in 1.3.x branch (#1729)

micrometer-metrics · Dec 3, 2019 · 003dc29 · 003dc29
1 parent 346bfd4
commit 003dc29
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/...atch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryCompatibilityTest.java b/...atch/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/...gistry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchMeterRegistryTest.java b/...gistry-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<List<MetricDatum>> argumentCaptor = ArgumentCaptor.forClass(List.class);
         verify(this.registry, times(2)).sendMetricData(argumentCaptor.capture());
         List<List<MetricDatum>> allValues = argumentCaptor.getAllValues();

diff --git a/...meter-registry-cloudwatch/src/test/java/io/micrometer/cloudwatch/CloudWatchUtilsTest.java b/...meter-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/...registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java b/...registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java
@@ -138,7 +138,9 @@ void sendMetricData(List<MetricDatum> 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/...stry-cloudwatch2/src/test/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistryTest.java b/...stry-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<List<MetricDatum>> argumentCaptor = ArgumentCaptor.forClass(List.class);
         verify(this.registry, times(2)).sendMetricData(argumentCaptor.capture());
         List<List<MetricDatum>> allValues = argumentCaptor.getAllValues();

diff --git a/...o/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutorTest.java b/...o/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;
 
 /**