Clean up compile warnings in master (micrometer-metrics#1733)

grantkl · Dec 4, 2019 · 782557d · 782557d
1 parent 9646f3b
commit 782557d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/ipc/http/OkHttpSender.java b/micrometer-core/src/main/java/io/micrometer/core/ipc/http/OkHttpSender.java
@@ -55,11 +55,11 @@ public Response send(Request request) throws Throwable {
             MediaType mediaType = contentType != null
                     ? MediaType.get(contentType + "; charset=utf-8")
                     : MEDIA_TYPE_APPLICATION_JSON;
-            RequestBody body = RequestBody.create(mediaType, entity);
+            RequestBody body = RequestBody.create(entity, mediaType);
             requestBuilder.method(requestMethod, body);
         } else {
             if (okhttp3.internal.http.HttpMethod.requiresRequestBody(requestMethod)) {
-                RequestBody body = RequestBody.create(MEDIA_TYPE_TEXT_PLAIN, entity);
+                RequestBody body = RequestBody.create(entity, MEDIA_TYPE_TEXT_PLAIN);
                 requestBuilder.method(requestMethod, body);
             } else {
                 requestBuilder.method(requestMethod, null);

diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterFilterTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/MeterFilterTest.java
@@ -148,7 +148,7 @@ void maximumAllowableTagsWhenDifferentTagKeyShouldNotAffect() {
         filter.accept(id1);
         filter.accept(id2);
         filter.accept(id3);
-        verifyZeroInteractions(onMaxReached);
+        verifyNoInteractions(onMaxReached);
 
         filter.accept(id4);
         verify(onMaxReached).accept(id4);
@@ -170,7 +170,7 @@ void maximumAllowableTagsWhenAlreadyInAllowableTagValuesShouldNotAffect() {
         filter.accept(id1);
         filter.accept(id2);
         filter.accept(id3);
-        verifyZeroInteractions(onMaxReached);
+        verifyNoInteractions(onMaxReached);
 
         filter.accept(id4);
         verify(onMaxReached).accept(id4);