From 782557d2a9d6d468ec2b6322843b201a20583129 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 4 Dec 2019 14:24:14 +0900 Subject: [PATCH] Clean up compile warnings in master (#1733) --- .../main/java/io/micrometer/core/ipc/http/OkHttpSender.java | 4 ++-- .../java/io/micrometer/core/instrument/MeterFilterTest.java | 4 ++-- 2 files changed, 4 insertions(+), 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 index 37fb3445f0..306cd79bbc 100644 --- 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 index 85ff5ab1ab..deb8ca8e8e 100644 --- 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);