> {
private Environment environment = Environment.PROD;
+ private String projectId;
+
private OkHttpClient httpClient;
/**
* Sets clientId.
* Defaults to the PIPEDREAM_CLIENT_ID environment variable.
*/
- @SuppressWarnings("unchecked")
- public T clientId(String clientId) {
+ public AsyncBaseClientBuilder clientId(String clientId) {
this.clientId = clientId;
- return (T) this;
+ return this;
}
/**
* Sets clientSecret.
* Defaults to the PIPEDREAM_CLIENT_SECRET environment variable.
*/
- @SuppressWarnings("unchecked")
- public T clientSecret(String clientSecret) {
+ public AsyncBaseClientBuilder clientSecret(String clientSecret) {
this.clientSecret = clientSecret;
- return (T) this;
+ return this;
}
/**
* Sets projectEnvironment
*/
- @SuppressWarnings("unchecked")
- public T projectEnvironment(String projectEnvironment) {
+ public AsyncBaseClientBuilder projectEnvironment(String projectEnvironment) {
this.projectEnvironment = projectEnvironment;
- return (T) this;
+ return this;
}
- @SuppressWarnings("unchecked")
- public T environment(Environment environment) {
+ public AsyncBaseClientBuilder environment(Environment environment) {
this.environment = environment;
- return (T) this;
+ return this;
}
- @SuppressWarnings("unchecked")
- public T url(String url) {
+ public AsyncBaseClientBuilder url(String url) {
this.environment = Environment.custom(url);
- return (T) this;
+ return this;
}
/**
* Sets the timeout (in seconds) for the client. Defaults to 60 seconds.
*/
- @SuppressWarnings("unchecked")
- public T timeout(int timeout) {
+ public AsyncBaseClientBuilder timeout(int timeout) {
this.timeout = Optional.of(timeout);
- return (T) this;
+ return this;
}
/**
* Sets the maximum number of retries for the client. Defaults to 2 retries.
*/
- @SuppressWarnings("unchecked")
- public T maxRetries(int maxRetries) {
+ public AsyncBaseClientBuilder maxRetries(int maxRetries) {
this.maxRetries = Optional.of(maxRetries);
- return (T) this;
+ return this;
}
/**
* Sets the underlying OkHttp client
*/
- @SuppressWarnings("unchecked")
- public T httpClient(OkHttpClient httpClient) {
+ public AsyncBaseClientBuilder httpClient(OkHttpClient httpClient) {
this.httpClient = httpClient;
- return (T) this;
+ return this;
+ }
+
+ public AsyncBaseClientBuilder projectId(String projectId) {
+ this.projectId = projectId;
+ return this;
}
protected ClientOptions buildClientOptions() {
@@ -124,7 +123,7 @@ protected void setEnvironment(ClientOptions.Builder builder) {
*
* Example:
* {@code
- * @Override
+ * @Override
* protected void setAuthentication(ClientOptions.Builder builder) {
* super.setAuthentication(builder); // Keep existing auth
* builder.addHeader("X-API-Key", this.apiKey);
@@ -149,7 +148,7 @@ protected void setAuthentication(ClientOptions.Builder builder) {
*
* Example:
* {@code
- * @Override
+ * @Override
* protected void setCustomHeaders(ClientOptions.Builder builder) {
* super.setCustomHeaders(builder); // Keep existing headers
* builder.addHeader("X-Trace-ID", generateTraceId());
@@ -215,9 +214,9 @@ protected void setHttpClient(ClientOptions.Builder builder) {
*
* Example:
* {@code
- * @Override
+ * @Override
* protected void setAdditional(ClientOptions.Builder builder) {
- * builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
+ * builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
* builder.addHeader("X-Client-Version", "1.0.0");
* }
* }
@@ -231,7 +230,7 @@ protected void setAdditional(ClientOptions.Builder builder) {}
*
* Example:
* {@code
- * @Override
+ * @Override
* protected void validateConfiguration() {
* super.validateConfiguration(); // Run parent validations
* if (tenantId == null || tenantId.isEmpty()) {
diff --git a/src/main/java/com/pipedream/api/AsyncPipedreamClientBuilder.java b/src/main/java/com/pipedream/api/AsyncPipedreamClientBuilder.java
index 8dc55ad..a53f1ce 100644
--- a/src/main/java/com/pipedream/api/AsyncPipedreamClientBuilder.java
+++ b/src/main/java/com/pipedream/api/AsyncPipedreamClientBuilder.java
@@ -8,7 +8,7 @@
/**
* Builder for creating AsyncPipedreamClient instances.
*/
-public final class AsyncPipedreamClientBuilder extends AsyncBaseClientBuilder {
+public final class AsyncPipedreamClientBuilder extends AsyncBaseClientBuilder {
private String projectId;
public AsyncPipedreamClient build() {
diff --git a/src/main/java/com/pipedream/api/BaseClient.java b/src/main/java/com/pipedream/api/BaseClient.java
index 53e69c6..69e5677 100644
--- a/src/main/java/com/pipedream/api/BaseClient.java
+++ b/src/main/java/com/pipedream/api/BaseClient.java
@@ -17,7 +17,6 @@
import com.pipedream.api.resources.tokens.TokensClient;
import com.pipedream.api.resources.triggers.TriggersClient;
import com.pipedream.api.resources.users.UsersClient;
-
import java.util.function.Supplier;
public class BaseClient {
diff --git a/src/main/java/com/pipedream/api/BaseClientBuilder.java b/src/main/java/com/pipedream/api/BaseClientBuilder.java
index 79c1350..d2cf060 100644
--- a/src/main/java/com/pipedream/api/BaseClientBuilder.java
+++ b/src/main/java/com/pipedream/api/BaseClientBuilder.java
@@ -10,7 +10,7 @@
import java.util.Optional;
import okhttp3.OkHttpClient;
-public class BaseClientBuilder> {
+public class BaseClientBuilder {
private Optional timeout = Optional.empty();
private Optional maxRetries = Optional.empty();
@@ -23,74 +23,73 @@ public class BaseClientBuilder> {
private Environment environment = Environment.PROD;
+ private String projectId;
+
private OkHttpClient httpClient;
/**
* Sets clientId.
* Defaults to the PIPEDREAM_CLIENT_ID environment variable.
*/
- @SuppressWarnings("unchecked")
- public T clientId(String clientId) {
+ public BaseClientBuilder clientId(String clientId) {
this.clientId = clientId;
- return (T) this;
+ return this;
}
/**
* Sets clientSecret.
* Defaults to the PIPEDREAM_CLIENT_SECRET environment variable.
*/
- @SuppressWarnings("unchecked")
- public T clientSecret(String clientSecret) {
+ public BaseClientBuilder clientSecret(String clientSecret) {
this.clientSecret = clientSecret;
- return (T) this;
+ return this;
}
/**
* Sets projectEnvironment
*/
- @SuppressWarnings("unchecked")
- public T projectEnvironment(String projectEnvironment) {
+ public BaseClientBuilder projectEnvironment(String projectEnvironment) {
this.projectEnvironment = projectEnvironment;
- return (T) this;
+ return this;
}
- @SuppressWarnings("unchecked")
- public T environment(Environment environment) {
+ public BaseClientBuilder environment(Environment environment) {
this.environment = environment;
- return (T) this;
+ return this;
}
- @SuppressWarnings("unchecked")
- public T url(String url) {
+ public BaseClientBuilder url(String url) {
this.environment = Environment.custom(url);
- return (T) this;
+ return this;
}
/**
* Sets the timeout (in seconds) for the client. Defaults to 60 seconds.
*/
- @SuppressWarnings("unchecked")
- public T timeout(int timeout) {
+ public BaseClientBuilder timeout(int timeout) {
this.timeout = Optional.of(timeout);
- return (T) this;
+ return this;
}
/**
* Sets the maximum number of retries for the client. Defaults to 2 retries.
*/
- @SuppressWarnings("unchecked")
- public T maxRetries(int maxRetries) {
+ public BaseClientBuilder maxRetries(int maxRetries) {
this.maxRetries = Optional.of(maxRetries);
- return (T) this;
+ return this;
}
/**
* Sets the underlying OkHttp client
*/
- @SuppressWarnings("unchecked")
- public T httpClient(OkHttpClient httpClient) {
+ public BaseClientBuilder httpClient(OkHttpClient httpClient) {
this.httpClient = httpClient;
- return (T) this;
+ return this;
+ }
+
+ public BaseClientBuilder projectId(String projectId) {
+ this.projectId = projectId;
+ return this;
}
protected ClientOptions buildClientOptions() {
@@ -124,7 +123,7 @@ protected void setEnvironment(ClientOptions.Builder builder) {
*
* Example:
* {@code
- * @Override
+ * @Override
* protected void setAuthentication(ClientOptions.Builder builder) {
* super.setAuthentication(builder); // Keep existing auth
* builder.addHeader("X-API-Key", this.apiKey);
@@ -149,7 +148,7 @@ protected void setAuthentication(ClientOptions.Builder builder) {
*
* Example:
* {@code
- * @Override
+ * @Override
* protected void setCustomHeaders(ClientOptions.Builder builder) {
* super.setCustomHeaders(builder); // Keep existing headers
* builder.addHeader("X-Trace-ID", generateTraceId());
@@ -215,9 +214,9 @@ protected void setHttpClient(ClientOptions.Builder builder) {
*
* Example:
* {@code
- * @Override
+ * @Override
* protected void setAdditional(ClientOptions.Builder builder) {
- * builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
+ * builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
* builder.addHeader("X-Client-Version", "1.0.0");
* }
* }
@@ -231,7 +230,7 @@ protected void setAdditional(ClientOptions.Builder builder) {}
*
* Example:
* {@code
- * @Override
+ * @Override
* protected void validateConfiguration() {
* super.validateConfiguration(); // Run parent validations
* if (tenantId == null || tenantId.isEmpty()) {
diff --git a/src/main/java/com/pipedream/api/PipedreamClientBuilder.java b/src/main/java/com/pipedream/api/PipedreamClientBuilder.java
index 2722b8b..c9b799c 100644
--- a/src/main/java/com/pipedream/api/PipedreamClientBuilder.java
+++ b/src/main/java/com/pipedream/api/PipedreamClientBuilder.java
@@ -8,7 +8,7 @@
/**
* Builder for creating PipedreamClient instances.
*/
-public final class PipedreamClientBuilder extends BaseClientBuilder {
+public final class PipedreamClientBuilder extends BaseClientBuilder {
private String projectId;
public PipedreamClient build() {
diff --git a/src/main/java/com/pipedream/api/core/ClientOptions.java b/src/main/java/com/pipedream/api/core/ClientOptions.java
index 2e7459a..3637ecb 100644
--- a/src/main/java/com/pipedream/api/core/ClientOptions.java
+++ b/src/main/java/com/pipedream/api/core/ClientOptions.java
@@ -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.256");
+ put("X-Fern-SDK-Version", "0.0.264");
}
});
this.headerSuppliers = headerSuppliers;