Make InputStream of MultiPartStreamer public

2 files changed, 7 insertions, 7 deletions

diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java
index 1b030190289..e42df52ca3f 100644
--- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java
+++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/api/MultiPartStreamer.java
@@ -70,15 +70,15 @@ public class MultiPartStreamer {
      * This method can be used multiple times, to create new requests.
      * The request builder's method and content should not be set after it has been obtained.
      */
-    public HttpRequest.Builder newBuilderFor(Method method) {
-        InputStream aggregate = aggregate(); // Get the streams now, not when the aggregate is used.
+    public HttpRequest.Builder requestBuilder(Method method) {
+        InputStream aggregate = data(); // Get the streams now, not when the aggregate is used.
         return HttpRequest.newBuilder()
                           .setHeader("Content-Type", "multipart/form-data; boundary=" + boundary)
                           .method(method.name(), HttpRequest.BodyPublishers.ofInputStream(() -> aggregate));
     }
 
     /** Returns an input stream which is an aggregate of all current parts in this, plus an end marker. */
-    InputStream aggregate() {
+    public InputStream data() {
         InputStream aggregate = new SequenceInputStream(Collections.enumeration(Stream.concat(streams.stream().map(Supplier::get),
                                                                                               Stream.of(end()))
                                                                                       .collect(Collectors.toList())));
diff --git a/vespa-maven-plugin/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java b/vespa-maven-plugin/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java
index b3915c51925..3abb04976c1 100644
--- a/vespa-maven-plugin/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java
+++ b/vespa-maven-plugin/src/test/java/ai/vespa/hosted/api/MultiPartStreamerTest.java
@@ -24,7 +24,7 @@ public class MultiPartStreamerTest {
         MultiPartStreamer streamer = new MultiPartStreamer("My boundary");
 
         assertEquals("--My boundary--",
-                     new String(streamer.aggregate().readAllBytes()));
+                     new String(streamer.data().readAllBytes()));
 
         streamer.addData("data", "uss/enterprise", "lore")
                 .addJson("json", "{\"xml\":false}")
@@ -54,14 +54,14 @@ public class MultiPartStreamerTest {
                           "--My boundary--";
 
         assertEquals(expected,
-                     new String(streamer.aggregate().readAllBytes()));
+                     new String(streamer.data().readAllBytes()));
 
         // Verify that all data is read again for a new builder.
         assertEquals(expected,
-                     new String(streamer.aggregate().readAllBytes()));
+                     new String(streamer.data().readAllBytes()));
 
         assertEquals(List.of("multipart/form-data; boundary=My boundary"),
-                     streamer.newBuilderFor(Method.POST)
+                     streamer.requestBuilder(Method.POST)
                              .uri(URI.create("https://uri/path"))
                              .build().headers().allValues("Content-Type"));
     }