Custom changes

Author: jverce

reference.md

@@ -152,12 +152,4 @@ public static AsyncBaseClientBuilder._TokenAuth withToken(String token) {
     public static AsyncBaseClientBuilder._CredentialsAuth withCredentials(String clientId, String clientSecret) {
         return AsyncBaseClientBuilder.withCredentials(clientId, clientSecret);
     }
-
-    /**
-     * Creates a new client builder.
-     * @return A builder for configuring and creating the client
-     */
-    public static AsyncBaseClientBuilder._Builder builder() {
-        return AsyncBaseClientBuilder.builder();
-    }
 }

src/main/java/com/pipedream/api/AsyncBaseClient.java

@@ -1,6 +1,3 @@
-/**
- * This file was auto-generated by Fern from our API Definition.
- */
 package com.pipedream.api;
 
 import com.pipedream.api.core.ClientOptions;
@@ -13,7 +10,7 @@
 import java.util.Optional;
 import okhttp3.OkHttpClient;
 
-public class AsyncBaseClientBuilder {
+public class AsyncBaseClientBuilder<T extends AsyncBaseClientBuilder<T>> {
     private Optional<Integer> timeout = Optional.empty();
 
     private Optional<Integer> maxRetries = Optional.empty();
@@ -67,51 +64,51 @@ public static _Builder builder() {
     /**
      * Sets projectEnvironment
      */
-    public AsyncBaseClientBuilder projectEnvironment(String projectEnvironment) {
+    public T projectEnvironment(String projectEnvironment) {
         this.projectEnvironment = projectEnvironment;
-        return this;
+        return (T) this;
     }
 
-    public AsyncBaseClientBuilder environment(Environment environment) {
+    public T environment(Environment environment) {
         this.environment = environment;
-        return this;
+        return (T) this;
     }
 
-    public AsyncBaseClientBuilder url(String url) {
+    public T url(String url) {
         this.environment = Environment.custom(url);
-        return this;
+        return (T) this;
     }
 
     /**
      * Sets the timeout (in seconds) for the client. Defaults to 60 seconds.
      */
-    public AsyncBaseClientBuilder timeout(int timeout) {
+    public T timeout(int timeout) {
         this.timeout = Optional.of(timeout);
-        return this;
+        return (T) this;
     }
 
     /**
      * Sets the maximum number of retries for the client. Defaults to 2 retries.
      */
-    public AsyncBaseClientBuilder maxRetries(int maxRetries) {
+    public T maxRetries(int maxRetries) {
         this.maxRetries = Optional.of(maxRetries);
-        return this;
+        return (T) this;
     }
 
     /**
      * Sets the underlying OkHttp client
      */
-    public AsyncBaseClientBuilder httpClient(OkHttpClient httpClient) {
+    public T httpClient(OkHttpClient httpClient) {
         this.httpClient = httpClient;
-        return this;
+        return (T) this;
     }
 
     /**
      * Configure logging for the SDK. Silent by default — no log output unless explicitly configured.
      */
-    public AsyncBaseClientBuilder logging(LogConfig logging) {
+    public T logging(LogConfig logging) {
         this.logging = Optional.of(logging);
-        return this;
+        return (T) this;
     }
 
     /**
@@ -122,14 +119,14 @@ public AsyncBaseClientBuilder logging(LogConfig logging) {
      * @param value The header value
      * @return This builder for method chaining
      */
-    public AsyncBaseClientBuilder addHeader(String name, String value) {
+    public T addHeader(String name, String value) {
         this.customHeaders.put(name, value);
-        return this;
+        return (T) this;
     }
 
-    public AsyncBaseClientBuilder projectId(String projectId) {
+    public T projectId(String projectId) {
         this.projectId = projectId;
-        return this;
+        return (T) this;
     }
 
     protected ClientOptions buildClientOptions() {
@@ -298,7 +295,7 @@ public AsyncBaseClient build() {
         return new AsyncBaseClient(buildClientOptions());
     }
 
-    public static final class _TokenAuth extends AsyncBaseClientBuilder {
+    public static final class _TokenAuth extends AsyncBaseClientBuilder<_TokenAuth> {
         private final String token;
 
         _TokenAuth(String token) {
@@ -311,7 +308,7 @@ protected void setAuthentication(ClientOptions.Builder builder) {
         }
     }
 
-    public static final class _CredentialsAuth extends AsyncBaseClientBuilder {
+    public static final class _CredentialsAuth extends AsyncBaseClientBuilder<_CredentialsAuth> {
         private final String clientId;
 
         private final String clientSecret;
@@ -351,6 +348,8 @@ public static final class _Builder {
 
         private OkHttpClient httpClient;
 
+        private Optional<LogConfig> logging = Optional.empty();
+
         private final Map<String, String> headers = new HashMap<>();
 
         public _Builder environment(Environment environment) {
@@ -387,6 +386,14 @@ public _Builder httpClient(OkHttpClient httpClient) {
             return this;
         }
 
+        /**
+         * Configure logging for the SDK. Silent by default — no log output unless explicitly configured.
+         */
+        public _Builder logging(LogConfig logging) {
+            this.logging = Optional.of(logging);
+            return this;
+        }
+
         /**
          * Add a custom header to be sent with all requests.
          * @param name The header name
@@ -408,21 +415,7 @@ public _Builder addHeader(String name, String value) {
          */
         public _TokenAuth token(String token) {
             _TokenAuth auth = new _TokenAuth(token);
-            if (this.environment != null) {
-                auth.environment = this.environment;
-            }
-            if (this.timeout.isPresent()) {
-                auth.timeout(this.timeout.get());
-            }
-            if (this.maxRetries.isPresent()) {
-                auth.maxRetries(this.maxRetries.get());
-            }
-            if (this.httpClient != null) {
-                auth.httpClient(this.httpClient);
-            }
-            for (Map.Entry<String, String> header : this.headers.entrySet()) {
-                auth.addHeader(header.getKey(), header.getValue());
-            }
+            applyTo(auth);
             return auth;
         }
 
@@ -436,6 +429,11 @@ public _TokenAuth token(String token) {
          */
         public _CredentialsAuth credentials(String clientId, String clientSecret) {
             _CredentialsAuth auth = new _CredentialsAuth(clientId, clientSecret);
+            applyTo(auth);
+            return auth;
+        }
+
+        private <B extends AsyncBaseClientBuilder<B>> void applyTo(B auth) {
             if (this.environment != null) {
                 auth.environment = this.environment;
             }
@@ -448,10 +446,12 @@ public _CredentialsAuth credentials(String clientId, String clientSecret) {
             if (this.httpClient != null) {
                 auth.httpClient(this.httpClient);
             }
+            if (this.logging.isPresent()) {
+                auth.logging(this.logging.get());
+            }
             for (Map.Entry<String, String> header : this.headers.entrySet()) {
                 auth.addHeader(header.getKey(), header.getValue());
             }
-            return auth;
         }
     }
 }

src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java

@@ -152,12 +152,4 @@ public static BaseClientBuilder._TokenAuth withToken(String token) {
     public static BaseClientBuilder._CredentialsAuth withCredentials(String clientId, String clientSecret) {
         return BaseClientBuilder.withCredentials(clientId, clientSecret);
     }
-
-    /**
-     * Creates a new client builder.
-     * @return A builder for configuring and creating the client
-     */
-    public static BaseClientBuilder._Builder builder() {
-        return BaseClientBuilder.builder();
-    }
 }