Polish micrometer-metricsgh-3791

See micrometer-metricsgh-3791
izeye · May 21, 2023 · 4655981 · 4655981
1 parent 2d7406b
commit 4655981
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/...micrometer/core/instrument/binder/httpcomponents/MicrometerHttpClientInterceptorTest.java b/...micrometer/core/instrument/binder/httpcomponents/MicrometerHttpClientInterceptorTest.java
@@ -35,7 +35,6 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.any;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
 
 /**
  * Tests for {@link MicrometerHttpClientInterceptor}.
@@ -64,14 +63,12 @@ void asyncRequest(@WiremockResolver.Wiremock WireMockServer server) throws Excep
         HttpResponse response = future.get();
 
         assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-        assertThatCode(() -> {
-            assertThat(registry.get("httpcomponents.httpclient.request")
-                .tag("method", "GET")
-                .tag("status", "200")
-                .tag("outcome", "SUCCESS")
-                .timer()
-                .count()).isEqualTo(1);
-        }).doesNotThrowAnyException();
+        assertThat(registry.get("httpcomponents.httpclient.request")
+            .tag("method", "GET")
+            .tag("status", "200")
+            .tag("outcome", "SUCCESS")
+            .timer()
+            .count()).isEqualTo(1);
 
         client.close();
     }

diff --git a/...ometer/core/instrument/binder/httpcomponents/hc5/MicrometerHttpClientInterceptorTest.java b/...ometer/core/instrument/binder/httpcomponents/hc5/MicrometerHttpClientInterceptorTest.java
@@ -38,7 +38,6 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.any;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
 
 /**
  * Tests for {@link MicrometerHttpClientInterceptor}.
@@ -67,14 +66,12 @@ void asyncRequest(@WiremockResolver.Wiremock WireMockServer server) throws Excep
         HttpResponse response = future.get();
 
         assertThat(response.getCode()).isEqualTo(200);
-        assertThatCode(() -> {
-            assertThat(registry.get("httpcomponents.httpclient.request")
-                .tag("method", "GET")
-                .tag("status", "200")
-                .tag("outcome", "SUCCESS")
-                .timer()
-                .count()).isEqualTo(1);
-        }).doesNotThrowAnyException();
+        assertThat(registry.get("httpcomponents.httpclient.request")
+            .tag("method", "GET")
+            .tag("status", "200")
+            .tag("outcome", "SUCCESS")
+            .timer()
+            .count()).isEqualTo(1);
 
         client.close();
     }

diff --git a/...rometer/core/instrument/ApacheAsyncHttpClient5TimingInstrumentationVerificationTests.java b/...rometer/core/instrument/ApacheAsyncHttpClient5TimingInstrumentationVerificationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 VMware, Inc.
+ * Copyright 2023 VMware, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...crometer/core/instrument/ApacheAsyncHttpClientTimingInstrumentationVerificationTests.java b/...crometer/core/instrument/ApacheAsyncHttpClientTimingInstrumentationVerificationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 VMware, Inc.
+ * Copyright 2023 VMware, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.