diff --git a/README.md b/README.md index 8516429..12099c8 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Add the dependency in your `pom.xml` file: com.pipedream pipedream - 1.0.5 + 1.0.6 ``` diff --git a/build.gradle b/build.gradle index e8564b2..21ef800 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ java { group = 'com.pipedream' -version = '1.0.5' +version = '1.0.6' jar { dependsOn(":generatePomFileForMavenPublication") @@ -79,7 +79,7 @@ publishing { maven(MavenPublication) { groupId = 'com.pipedream' artifactId = 'pipedream' - version = '1.0.5' + version = '1.0.6' from components.java pom { name = 'pipedream' diff --git a/src/main/java/com/pipedream/api/core/ClientOptions.java b/src/main/java/com/pipedream/api/core/ClientOptions.java index 1dd75f9..8e17e45 100644 --- a/src/main/java/com/pipedream/api/core/ClientOptions.java +++ b/src/main/java/com/pipedream/api/core/ClientOptions.java @@ -35,10 +35,10 @@ private ClientOptions( this.headers.putAll(headers); this.headers.putAll(new HashMap() { { - put("User-Agent", "com.pipedream:pipedream/1.0.5"); + put("User-Agent", "com.pipedream:pipedream/1.0.6"); put("X-Fern-Language", "JAVA"); put("X-Fern-SDK-Name", "com.pipedream.fern:api-sdk"); - put("X-Fern-SDK-Version", "1.0.5"); + put("X-Fern-SDK-Version", "1.0.6"); } }); this.headerSuppliers = headerSuppliers; diff --git a/src/main/java/com/pipedream/api/resources/filestash/AsyncFileStashClient.java b/src/main/java/com/pipedream/api/resources/filestash/AsyncFileStashClient.java index 72caf81..40ca561 100644 --- a/src/main/java/com/pipedream/api/resources/filestash/AsyncFileStashClient.java +++ b/src/main/java/com/pipedream/api/resources/filestash/AsyncFileStashClient.java @@ -6,6 +6,7 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.filestash.requests.FileStashDownloadFileRequest; +import java.io.InputStream; import java.util.concurrent.CompletableFuture; public class AsyncFileStashClient { @@ -28,14 +29,15 @@ public AsyncRawFileStashClient withRawResponse() { /** * Download a file from File Stash */ - public CompletableFuture downloadFile(FileStashDownloadFileRequest request) { + public CompletableFuture downloadFile(FileStashDownloadFileRequest request) { return this.rawClient.downloadFile(request).thenApply(response -> response.body()); } /** * Download a file from File Stash */ - public CompletableFuture downloadFile(FileStashDownloadFileRequest request, RequestOptions requestOptions) { + public CompletableFuture downloadFile( + FileStashDownloadFileRequest request, RequestOptions requestOptions) { return this.rawClient.downloadFile(request, requestOptions).thenApply(response -> response.body()); } } diff --git a/src/main/java/com/pipedream/api/resources/filestash/AsyncRawFileStashClient.java b/src/main/java/com/pipedream/api/resources/filestash/AsyncRawFileStashClient.java index 89668b6..aa73f5d 100644 --- a/src/main/java/com/pipedream/api/resources/filestash/AsyncRawFileStashClient.java +++ b/src/main/java/com/pipedream/api/resources/filestash/AsyncRawFileStashClient.java @@ -11,9 +11,11 @@ import com.pipedream.api.core.ObjectMappers; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; +import com.pipedream.api.core.ResponseBodyInputStream; import com.pipedream.api.errors.TooManyRequestsError; import com.pipedream.api.resources.filestash.requests.FileStashDownloadFileRequest; import java.io.IOException; +import java.io.InputStream; import java.util.concurrent.CompletableFuture; import okhttp3.Call; import okhttp3.Callback; @@ -35,14 +37,14 @@ public AsyncRawFileStashClient(ClientOptions clientOptions) { /** * Download a file from File Stash */ - public CompletableFuture> downloadFile(FileStashDownloadFileRequest request) { + public CompletableFuture> downloadFile(FileStashDownloadFileRequest request) { return downloadFile(request, null); } /** * Download a file from File Stash */ - public CompletableFuture> downloadFile( + public CompletableFuture> downloadFile( FileStashDownloadFileRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -60,13 +62,14 @@ public CompletableFuture> downloadFile( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { - try (ResponseBody responseBody = response.body()) { + try { + ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - future.complete(new BaseClientHttpResponse<>(null, response)); + future.complete(new BaseClientHttpResponse<>(new ResponseBodyInputStream(response), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; diff --git a/src/main/java/com/pipedream/api/resources/filestash/FileStashClient.java b/src/main/java/com/pipedream/api/resources/filestash/FileStashClient.java index f889b1e..3e08288 100644 --- a/src/main/java/com/pipedream/api/resources/filestash/FileStashClient.java +++ b/src/main/java/com/pipedream/api/resources/filestash/FileStashClient.java @@ -6,6 +6,7 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.filestash.requests.FileStashDownloadFileRequest; +import java.io.InputStream; public class FileStashClient { protected final ClientOptions clientOptions; @@ -27,14 +28,14 @@ public RawFileStashClient withRawResponse() { /** * Download a file from File Stash */ - public void downloadFile(FileStashDownloadFileRequest request) { - this.rawClient.downloadFile(request).body(); + public InputStream downloadFile(FileStashDownloadFileRequest request) { + return this.rawClient.downloadFile(request).body(); } /** * Download a file from File Stash */ - public void downloadFile(FileStashDownloadFileRequest request, RequestOptions requestOptions) { - this.rawClient.downloadFile(request, requestOptions).body(); + public InputStream downloadFile(FileStashDownloadFileRequest request, RequestOptions requestOptions) { + return this.rawClient.downloadFile(request, requestOptions).body(); } } diff --git a/src/main/java/com/pipedream/api/resources/filestash/RawFileStashClient.java b/src/main/java/com/pipedream/api/resources/filestash/RawFileStashClient.java index 777c227..2bd5052 100644 --- a/src/main/java/com/pipedream/api/resources/filestash/RawFileStashClient.java +++ b/src/main/java/com/pipedream/api/resources/filestash/RawFileStashClient.java @@ -11,9 +11,11 @@ import com.pipedream.api.core.ObjectMappers; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; +import com.pipedream.api.core.ResponseBodyInputStream; import com.pipedream.api.errors.TooManyRequestsError; import com.pipedream.api.resources.filestash.requests.FileStashDownloadFileRequest; import java.io.IOException; +import java.io.InputStream; import okhttp3.Headers; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -31,14 +33,14 @@ public RawFileStashClient(ClientOptions clientOptions) { /** * Download a file from File Stash */ - public BaseClientHttpResponse downloadFile(FileStashDownloadFileRequest request) { + public BaseClientHttpResponse downloadFile(FileStashDownloadFileRequest request) { return downloadFile(request, null); } /** * Download a file from File Stash */ - public BaseClientHttpResponse downloadFile( + public BaseClientHttpResponse downloadFile( FileStashDownloadFileRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -56,10 +58,11 @@ public BaseClientHttpResponse downloadFile( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - try (Response response = client.newCall(okhttpRequest).execute()) { + try { + Response response = client.newCall(okhttpRequest).execute(); ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new BaseClientHttpResponse<>(null, response); + return new BaseClientHttpResponse<>(new ResponseBodyInputStream(response), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; try {