Created BodyWriter to use in HttpSender

Author: LikeTheSalad

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/connectivity/http/HttpSender.java

@@ -6,14 +6,18 @@
 package io.opentelemetry.opamp.client.internal.connectivity.http;
 
 import java.io.Closeable;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
 
 public interface HttpSender {
 
-  CompletableFuture<Response> send(Consumer<OutputStream> writer, int contentLength);
+  CompletableFuture<Response> send(BodyWriter writer, int contentLength);
+
+  interface BodyWriter {
+    void writeTo(OutputStream outputStream) throws IOException;
+  }
 
   interface Response extends Closeable {
     int statusCode();

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/connectivity/http/OkHttpSender.java

@@ -7,9 +7,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.MediaType;
@@ -40,7 +38,7 @@ private OkHttpSender(String url, OkHttpClient client) {
   }
 
   @Override
-  public CompletableFuture<Response> send(Consumer<OutputStream> writer, int contentLength) {
+  public CompletableFuture<Response> send(BodyWriter writer, int contentLength) {
     CompletableFuture<Response> future = new CompletableFuture<>();
     okhttp3.Request.Builder builder = new okhttp3.Request.Builder().url(url);
     builder.addHeader("Content-Type", CONTENT_TYPE);
@@ -108,12 +106,11 @@ public void close() {
   }
 
   private static class RawRequestBody extends RequestBody {
-    private final Consumer<OutputStream> writer;
+    private final BodyWriter writer;
     private final int contentLength;
     private final MediaType contentType;
 
-    private RawRequestBody(
-        Consumer<OutputStream> writer, int contentLength, MediaType contentType) {
+    private RawRequestBody(BodyWriter writer, int contentLength, MediaType contentType) {
       this.writer = writer;
       this.contentLength = contentLength;
       this.contentType = contentType;
@@ -131,8 +128,8 @@ public long contentLength() {
     }
 
     @Override
-    public void writeTo(@NotNull BufferedSink bufferedSink) {
-      writer.accept(bufferedSink.outputStream());
+    public void writeTo(@NotNull BufferedSink bufferedSink) throws IOException {
+      writer.writeTo(bufferedSink.outputStream());
     }
   }
 }

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java

@@ -20,7 +20,6 @@
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
 import opamp.proto.AgentToServer;
@@ -205,21 +204,16 @@ private Callback getCallback() {
     return Objects.requireNonNull(callback);
   }
 
-  private static class ByteArrayWriter implements Consumer<OutputStream> {
+  private static class ByteArrayWriter implements HttpSender.BodyWriter {
     private final byte[] data;
 
     private ByteArrayWriter(byte[] data) {
       this.data = data;
     }
 
-    @SuppressWarnings("ThrowSpecificExceptions")
     @Override
-    public void accept(OutputStream outputStream) {
-      try {
-        outputStream.write(data);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
+    public void writeTo(OutputStream outputStream) throws IOException {
+      outputStream.write(data);
     }
   }
 }