From c6a99f1742b0c337bf477bf384df060f8a144f00 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 3 Dec 2019 11:26:11 +0900 Subject: [PATCH] Clean up compile warnings (#1728) --- .../io/micrometer/cloudwatch/CloudWatchMeterRegistry.java | 4 +++- .../io/micrometer/dynatrace/DynatraceMeterRegistryTest.java | 1 + .../ganglia/GangliaMeterRegistryCompatibilityTest.java | 5 ++--- .../test/java/io/micrometer/core/ipc/http/RequestTest.java | 1 + .../properties/StepRegistryPropertiesConfigAdapter.java | 2 ++ .../export/properties/StepRegistryPropertiesTest.java | 1 + .../spring/web/client/RestTemplateExchangeTagsTest.java | 4 ++-- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/implementations/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java b/implementations/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java index 8c34ea2ac9..d490bb8ea8 100644 --- a/implementations/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java +++ b/implementations/micrometer-registry-cloudwatch/src/main/java/io/micrometer/cloudwatch/CloudWatchMeterRegistry.java @@ -121,7 +121,9 @@ public void onSuccess(PutMetricDataRequest request, PutMetricDataResult result) } }); 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-dynatrace/src/test/java/io/micrometer/dynatrace/DynatraceMeterRegistryTest.java b/implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/DynatraceMeterRegistryTest.java index 27e9679a86..83a20ab9e6 100644 --- a/implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/DynatraceMeterRegistryTest.java +++ b/implementations/micrometer-registry-dynatrace/src/test/java/io/micrometer/dynatrace/DynatraceMeterRegistryTest.java @@ -145,6 +145,7 @@ void writeMeterWithGaugeShouldDropNanValue() { assertThat(meterRegistry.writeMeter(gauge)).isEmpty(); } + @SuppressWarnings("unchecked") @Test void writeMeterWithGaugeWhenChangingFiniteToNaNShouldWork() { AtomicBoolean first = new AtomicBoolean(true); diff --git a/implementations/micrometer-registry-ganglia/src/test/java/io/micrometer/ganglia/GangliaMeterRegistryCompatibilityTest.java b/implementations/micrometer-registry-ganglia/src/test/java/io/micrometer/ganglia/GangliaMeterRegistryCompatibilityTest.java index 0e7ebf6981..c81d7179d1 100644 --- a/implementations/micrometer-registry-ganglia/src/test/java/io/micrometer/ganglia/GangliaMeterRegistryCompatibilityTest.java +++ b/implementations/micrometer-registry-ganglia/src/test/java/io/micrometer/ganglia/GangliaMeterRegistryCompatibilityTest.java @@ -17,7 +17,6 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MockClock; -import io.micrometer.core.instrument.util.HierarchicalNameMapper; import io.micrometer.core.lang.Nullable; import io.micrometer.core.tck.MeterRegistryCompatibilityKit; @@ -26,7 +25,7 @@ class GangliaMeterRegistryCompatibilityTest extends MeterRegistryCompatibilityKit { @Override public MeterRegistry registry() { - return new GangliaMeterRegistry(new GangliaConfig() { + return GangliaMeterRegistry.builder(new GangliaConfig() { @Override public boolean enabled() { return false; @@ -37,7 +36,7 @@ public boolean enabled() { public String get(String key) { return null; } - }, new MockClock(), HierarchicalNameMapper.DEFAULT); + }).clock(new MockClock()).build(); } @Override diff --git a/micrometer-core/src/test/java/io/micrometer/core/ipc/http/RequestTest.java b/micrometer-core/src/test/java/io/micrometer/core/ipc/http/RequestTest.java index 84ae2e78d4..5b7e7c2d97 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/ipc/http/RequestTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/ipc/http/RequestTest.java @@ -36,6 +36,7 @@ void compressShouldAddContentEncodingHeader() throws IOException, NoSuchFieldExc HttpSender.Request.Builder builder = HttpSender.Request.build("https://micrometer.io/", mock(HttpSender.class)).compress(); Field requestHeadersField = HttpSender.Request.Builder.class.getDeclaredField("requestHeaders"); requestHeadersField.setAccessible(true); + @SuppressWarnings("unchecked") Map requestHeaders = (Map) requestHeadersField.get(builder); assertThat(requestHeaders).containsEntry("Content-Encoding", "gzip"); } diff --git a/micrometer-spring-legacy/src/main/java/io/micrometer/spring/autoconfigure/export/properties/StepRegistryPropertiesConfigAdapter.java b/micrometer-spring-legacy/src/main/java/io/micrometer/spring/autoconfigure/export/properties/StepRegistryPropertiesConfigAdapter.java index 1d7a2bac52..d52a9d8313 100644 --- a/micrometer-spring-legacy/src/main/java/io/micrometer/spring/autoconfigure/export/properties/StepRegistryPropertiesConfigAdapter.java +++ b/micrometer-spring-legacy/src/main/java/io/micrometer/spring/autoconfigure/export/properties/StepRegistryPropertiesConfigAdapter.java @@ -53,11 +53,13 @@ public boolean enabled() { return get(T::isEnabled, StepRegistryConfig.super::enabled); } + @SuppressWarnings("deprecation") @Override public Duration connectTimeout() { return get(T::getConnectTimeout, StepRegistryConfig.super::connectTimeout); } + @SuppressWarnings("deprecation") @Override public Duration readTimeout() { return get(T::getReadTimeout, StepRegistryConfig.super::readTimeout); diff --git a/micrometer-spring-legacy/src/test/java/io/micrometer/spring/autoconfigure/export/properties/StepRegistryPropertiesTest.java b/micrometer-spring-legacy/src/test/java/io/micrometer/spring/autoconfigure/export/properties/StepRegistryPropertiesTest.java index 6684477313..a03fb3377a 100644 --- a/micrometer-spring-legacy/src/test/java/io/micrometer/spring/autoconfigure/export/properties/StepRegistryPropertiesTest.java +++ b/micrometer-spring-legacy/src/test/java/io/micrometer/spring/autoconfigure/export/properties/StepRegistryPropertiesTest.java @@ -27,6 +27,7 @@ */ public abstract class StepRegistryPropertiesTest { + @SuppressWarnings("deprecation") protected void assertStepRegistryDefaultValues(StepRegistryProperties properties, StepRegistryConfig config) { assertThat(properties.getStep()).isEqualTo(config.step()); diff --git a/micrometer-spring-legacy/src/test/java/io/micrometer/spring/web/client/RestTemplateExchangeTagsTest.java b/micrometer-spring-legacy/src/test/java/io/micrometer/spring/web/client/RestTemplateExchangeTagsTest.java index 4473407d4c..4931d9a03d 100644 --- a/micrometer-spring-legacy/src/test/java/io/micrometer/spring/web/client/RestTemplateExchangeTagsTest.java +++ b/micrometer-spring-legacy/src/test/java/io/micrometer/spring/web/client/RestTemplateExchangeTagsTest.java @@ -79,7 +79,7 @@ public void outcomeTagIsServerErrorWhenResponseIs5xx() { @Test public void outcomeTagIsUnknownWhenResponseThrowsIOException() throws Exception { ClientHttpResponse response = mock(ClientHttpResponse.class); - given(response.getRawStatusCode()).willThrow(IOException.class); + given(response.getRawStatusCode()).willThrow(new IOException()); Tag tag = RestTemplateExchangeTags.outcome(response); assertThat(tag.getValue()).isEqualTo("UNKNOWN"); } @@ -87,7 +87,7 @@ public void outcomeTagIsUnknownWhenResponseThrowsIOException() throws Exception @Test public void outcomeTagIsUnknownForCustomResponseStatus() throws Exception { ClientHttpResponse response = mock(ClientHttpResponse.class); - given(response.getRawStatusCode()).willThrow(IllegalArgumentException.class); + given(response.getRawStatusCode()).willThrow(new IllegalArgumentException()); Tag tag = RestTemplateExchangeTags.outcome(response); assertThat(tag.getValue()).isEqualTo("UNKNOWN"); }