Skip to content
Merged
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
Binary file modified .gradle/8.14.3/checksums/checksums.lock
Binary file not shown.
Binary file modified .gradle/8.14.3/checksums/md5-checksums.bin
Binary file not shown.
Binary file modified .gradle/8.14.3/checksums/sha1-checksums.bin
Binary file not shown.
Binary file modified .gradle/8.14.3/executionHistory/executionHistory.bin
Binary file not shown.
Binary file modified .gradle/8.14.3/executionHistory/executionHistory.lock
Binary file not shown.
Binary file modified .gradle/8.14.3/fileHashes/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/8.14.3/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
2 changes: 1 addition & 1 deletion .gradle/buildOutputCleanup/cache.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Fri Jul 18 22:37:14 UTC 2025
#Thu Jul 24 19:20:25 UTC 2025
gradle.version=8.14.3
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>0.0.220</version>
<version>0.0.237</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 = '0.0.220'
version = '0.0.237'

jar {
dependsOn(":generatePomFileForMavenPublication")
Expand Down Expand Up @@ -79,7 +79,7 @@ publishing {
maven(MavenPublication) {
groupId = 'com.pipedream'
artifactId = 'pipedream'
version = '0.0.220'
version = '0.0.237'
from components.java
pom {
name = 'pipedream'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.pipedream.api.resources.oauthtokens.OauthTokensClient;
import okhttp3.OkHttpClient;

public final class AsyncBaseClientBuilder {
public class AsyncBaseClientBuilder {
private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();

private String clientId = System.getenv("PIPEDREAM_CLIENT_ID");
Expand Down Expand Up @@ -85,6 +85,11 @@ public AsyncBaseClientBuilder projectId(String projectId) {
return this;
}

protected ClientOptions buildClientOptions() {
clientOptionsBuilder.environment(this.environment);
return clientOptionsBuilder.build();
}

public AsyncBaseClient build() {
OauthTokensClient authClient = new OauthTokensClient(
ClientOptions.builder().environment(this.environment).build());
Expand All @@ -93,7 +98,6 @@ public AsyncBaseClient build() {
if (projectEnvironment != null) {
this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment);
}
clientOptionsBuilder.environment(this.environment);
return new AsyncBaseClient(clientOptionsBuilder.build());
return new AsyncBaseClient(buildClientOptions());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.pipedream.api.resources.oauthtokens.OauthTokensClient;
import okhttp3.OkHttpClient;

public final class BaseClientBuilder {
public class BaseClientBuilder {
private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();

private String clientId = System.getenv("PIPEDREAM_CLIENT_ID");
Expand Down Expand Up @@ -85,6 +85,11 @@ public BaseClientBuilder projectId(String projectId) {
return this;
}

protected ClientOptions buildClientOptions() {
clientOptionsBuilder.environment(this.environment);
return clientOptionsBuilder.build();
}

public BaseClient build() {
OauthTokensClient authClient = new OauthTokensClient(
ClientOptions.builder().environment(this.environment).build());
Expand All @@ -93,7 +98,6 @@ public BaseClient build() {
if (projectEnvironment != null) {
this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment);
}
clientOptionsBuilder.environment(this.environment);
return new BaseClient(clientOptionsBuilder.build());
return new BaseClient(buildClientOptions());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private ClientOptions(
{
put("X-Fern-Language", "JAVA");
put("X-Fern-SDK-Name", "com.pipedream.fern:api-sdk");
put("X-Fern-SDK-Version", "0.0.220");
put("X-Fern-SDK-Version", "0.0.237");
}
});
this.headerSuppliers = headerSuppliers;
Expand Down Expand Up @@ -93,7 +93,7 @@ public static Builder builder() {
return new Builder();
}

public static final class Builder {
public static class Builder {
private Environment environment;

private final Map<String, String> headers = new HashMap<>();
Expand Down Expand Up @@ -182,5 +182,17 @@ public ClientOptions build() {
return new ClientOptions(
environment, headers, headerSuppliers, httpClient, this.timeout.get(), this.projectId);
}

/**
* Create a new Builder initialized with values from an existing ClientOptions
*/
public static Builder from(ClientOptions clientOptions) {
Builder builder = new Builder();
builder.environment = clientOptions.environment();
builder.timeout = Optional.of(clientOptions.timeout(null));
builder.httpClient = clientOptions.httpClient();
builder.projectId = clientOptions.projectId();
return builder;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static Builder builder() {
return new Builder();
}

public static final class Builder {
public static class Builder {
private String projectEnvironment = null;

private Optional<Integer> timeout = Optional.empty();
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.pipedream.api.resources.oauthtokens.OauthTokensClient;
import okhttp3.OkHttpClient;

public final class AsyncBaseClientBuilder {
public class AsyncBaseClientBuilder {
private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();

private String clientId = System.getenv("PIPEDREAM_CLIENT_ID");
Expand Down Expand Up @@ -85,6 +85,11 @@ public AsyncBaseClientBuilder projectId(String projectId) {
return this;
}

protected ClientOptions buildClientOptions() {
clientOptionsBuilder.environment(this.environment);
return clientOptionsBuilder.build();
}

public AsyncBaseClient build() {
OauthTokensClient authClient = new OauthTokensClient(
ClientOptions.builder().environment(this.environment).build());
Expand All @@ -93,7 +98,6 @@ public AsyncBaseClient build() {
if (projectEnvironment != null) {
this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment);
}
clientOptionsBuilder.environment(this.environment);
return new AsyncBaseClient(clientOptionsBuilder.build());
return new AsyncBaseClient(buildClientOptions());
}
}
10 changes: 7 additions & 3 deletions src/main/java/com/pipedream/api/BaseClientBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.pipedream.api.resources.oauthtokens.OauthTokensClient;
import okhttp3.OkHttpClient;

public final class BaseClientBuilder {
public class BaseClientBuilder {
private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder();

private String clientId = System.getenv("PIPEDREAM_CLIENT_ID");
Expand Down Expand Up @@ -85,6 +85,11 @@ public BaseClientBuilder projectId(String projectId) {
return this;
}

protected ClientOptions buildClientOptions() {
clientOptionsBuilder.environment(this.environment);
return clientOptionsBuilder.build();
}

public BaseClient build() {
OauthTokensClient authClient = new OauthTokensClient(
ClientOptions.builder().environment(this.environment).build());
Expand All @@ -93,7 +98,6 @@ public BaseClient build() {
if (projectEnvironment != null) {
this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment);
}
clientOptionsBuilder.environment(this.environment);
return new BaseClient(clientOptionsBuilder.build());
return new BaseClient(buildClientOptions());
}
}
16 changes: 14 additions & 2 deletions src/main/java/com/pipedream/api/core/ClientOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private ClientOptions(
{
put("X-Fern-Language", "JAVA");
put("X-Fern-SDK-Name", "com.pipedream.fern:api-sdk");
put("X-Fern-SDK-Version", "0.0.220");
put("X-Fern-SDK-Version", "0.0.237");
}
});
this.headerSuppliers = headerSuppliers;
Expand Down Expand Up @@ -93,7 +93,7 @@ public static Builder builder() {
return new Builder();
}

public static final class Builder {
public static class Builder {
private Environment environment;

private final Map<String, String> headers = new HashMap<>();
Expand Down Expand Up @@ -182,5 +182,17 @@ public ClientOptions build() {
return new ClientOptions(
environment, headers, headerSuppliers, httpClient, this.timeout.get(), this.projectId);
}

/**
* Create a new Builder initialized with values from an existing ClientOptions
*/
public static Builder from(ClientOptions clientOptions) {
Builder builder = new Builder();
builder.environment = clientOptions.environment();
builder.timeout = Optional.of(clientOptions.timeout(null));
builder.httpClient = clientOptions.httpClient();
builder.projectId = clientOptions.projectId();
return builder;
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/pipedream/api/core/RequestOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static Builder builder() {
return new Builder();
}

public static final class Builder {
public static class Builder {
private String projectEnvironment = null;

private Optional<Integer> timeout = Optional.empty();
Expand Down