Make sendHttpRequest protected

It could not be implemented by classes outside the same package previously because it was package-private. Closes gh-3308
micrometer-metrics · Jul 22, 2022 · 2a7b1dc · 2a7b1dc
1 parent 244bbdb
commit 2a7b1dc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.../java/io/micrometer/core/instrument/HttpClientTimingInstrumentationVerificationTests.java b/.../java/io/micrometer/core/instrument/HttpClientTimingInstrumentationVerificationTests.java
@@ -75,7 +75,7 @@ protected String timerName() {
      * forward slash, and optionally containing path variable placeholders
      * @param pathVariables optional variables to substitute into the templatedPath
      */
-    abstract void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI baseUrl, String templatedPath,
+    protected abstract void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI baseUrl, String templatedPath,
             String... pathVariables);
 
     /**

diff --git a/...io/micrometer/core/instrument/ApacheHttpClientTimingInstrumentationVerificationTests.java b/...io/micrometer/core/instrument/ApacheHttpClientTimingInstrumentationVerificationTests.java
@@ -40,7 +40,7 @@ protected String timerName() {
     }
 
     @Override
-    void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI baseUri, String templatedPath,
+    protected void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI baseUri, String templatedPath,
             String... pathVariables) {
         try {
             EntityUtils.consume(

diff --git a/...java/io/micrometer/core/instrument/JettyClientTimingInstrumentationVerificationTests.java b/...java/io/micrometer/core/instrument/JettyClientTimingInstrumentationVerificationTests.java
@@ -41,7 +41,7 @@ void setup() throws Exception {
     }
 
     @Override
-    void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI baseUri, String templatedPath,
+    protected void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI baseUri, String templatedPath,
             String... pathVariables) {
         try {
             Request request = httpClient.newRequest(baseUri + substitutePathVariables(templatedPath, pathVariables))

diff --git a/...ava/io/micrometer/core/instrument/OkHttpClientTimingInstrumentationVerificationTests.java b/...ava/io/micrometer/core/instrument/OkHttpClientTimingInstrumentationVerificationTests.java
@@ -31,7 +31,7 @@ class OkHttpClientTimingInstrumentationVerificationTests extends HttpClientTimin
             .eventListener(OkHttpMetricsEventListener.builder(getRegistry(), timerName()).build()).build();
 
     @Override
-    void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI baseUri, String templatedPath,
+    protected void sendHttpRequest(HttpMethod method, @Nullable byte[] body, URI baseUri, String templatedPath,
             String... pathVariables) {
         Request request = new Request.Builder().method(method.name(), body == null ? null : RequestBody.create(body))
                 .url(baseUri + substitutePathVariables(templatedPath, pathVariables))