Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Add the dependency in your `pom.xml` file:
<dependency>
<groupId>com.pipedream</groupId>
<artifactId>pipedream</artifactId>
<version>1.0.5</version>
<version>1.0.6</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ java {

group = 'com.pipedream'

version = '1.0.5'
version = '1.0.6'

jar {
dependsOn(":generatePomFileForMavenPublication")
Expand Down Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/pipedream/api/core/ClientOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ private ClientOptions(
this.headers.putAll(headers);
this.headers.putAll(new HashMap<String, String>() {
{
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -28,14 +29,15 @@ public AsyncRawFileStashClient withRawResponse() {
/**
* Download a file from File Stash
*/
public CompletableFuture<Void> downloadFile(FileStashDownloadFileRequest request) {
public CompletableFuture<InputStream> downloadFile(FileStashDownloadFileRequest request) {
return this.rawClient.downloadFile(request).thenApply(response -> response.body());
}

/**
* Download a file from File Stash
*/
public CompletableFuture<Void> downloadFile(FileStashDownloadFileRequest request, RequestOptions requestOptions) {
public CompletableFuture<InputStream> downloadFile(
FileStashDownloadFileRequest request, RequestOptions requestOptions) {
return this.rawClient.downloadFile(request, requestOptions).thenApply(response -> response.body());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -35,14 +37,14 @@ public AsyncRawFileStashClient(ClientOptions clientOptions) {
/**
* Download a file from File Stash
*/
public CompletableFuture<BaseClientHttpResponse<Void>> downloadFile(FileStashDownloadFileRequest request) {
public CompletableFuture<BaseClientHttpResponse<InputStream>> downloadFile(FileStashDownloadFileRequest request) {
return downloadFile(request, null);
}

/**
* Download a file from File Stash
*/
public CompletableFuture<BaseClientHttpResponse<Void>> downloadFile(
public CompletableFuture<BaseClientHttpResponse<InputStream>> downloadFile(
FileStashDownloadFileRequest request, RequestOptions requestOptions) {
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
Expand All @@ -60,13 +62,14 @@ public CompletableFuture<BaseClientHttpResponse<Void>> downloadFile(
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
client = clientOptions.httpClientWithTimeout(requestOptions);
}
CompletableFuture<BaseClientHttpResponse<Void>> future = new CompletableFuture<>();
CompletableFuture<BaseClientHttpResponse<InputStream>> 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() : "{}";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,14 +33,14 @@ public RawFileStashClient(ClientOptions clientOptions) {
/**
* Download a file from File Stash
*/
public BaseClientHttpResponse<Void> downloadFile(FileStashDownloadFileRequest request) {
public BaseClientHttpResponse<InputStream> downloadFile(FileStashDownloadFileRequest request) {
return downloadFile(request, null);
}

/**
* Download a file from File Stash
*/
public BaseClientHttpResponse<Void> downloadFile(
public BaseClientHttpResponse<InputStream> downloadFile(
FileStashDownloadFileRequest request, RequestOptions requestOptions) {
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
Expand All @@ -56,10 +58,11 @@ public BaseClientHttpResponse<Void> 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 {
Expand Down