Update base client builders

Author: jverce

.fernignore

@@ -10,6 +10,8 @@ LICENSE
 reference.md
 
 # Base client files (temporary)
+src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java
+src/main/java/com/pipedream/api/BaseClientBuilder.java
 
 # Custom Pipedream client files
 

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

@@ -12,7 +12,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();
@@ -35,60 +35,68 @@ public class AsyncBaseClientBuilder {
      * Sets clientId.
      * Defaults to the PIPEDREAM_CLIENT_ID environment variable.
      */
-    public AsyncBaseClientBuilder clientId(String clientId) {
+    @SuppressWarnings("unchecked")
+    public T clientId(String clientId) {
         this.clientId = clientId;
-        return this;
+        return (T) this;
     }
 
     /**
      * Sets clientSecret.
      * Defaults to the PIPEDREAM_CLIENT_SECRET environment variable.
      */
-    public AsyncBaseClientBuilder clientSecret(String clientSecret) {
+    @SuppressWarnings("unchecked")
+    public T clientSecret(String clientSecret) {
         this.clientSecret = clientSecret;
-        return this;
+        return (T) this;
     }
 
     /**
      * Sets projectEnvironment
      */
-    public AsyncBaseClientBuilder projectEnvironment(String projectEnvironment) {
+    @SuppressWarnings("unchecked")
+    public T projectEnvironment(String projectEnvironment) {
         this.projectEnvironment = projectEnvironment;
-        return this;
+        return (T) this;
     }
 
-    public AsyncBaseClientBuilder environment(Environment environment) {
+    @SuppressWarnings("unchecked")
+    public T environment(Environment environment) {
         this.environment = environment;
-        return this;
+        return (T) this;
     }
 
-    public AsyncBaseClientBuilder url(String url) {
+    @SuppressWarnings("unchecked")
+    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) {
+    @SuppressWarnings("unchecked")
+    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) {
+    @SuppressWarnings("unchecked")
+    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) {
+    @SuppressWarnings("unchecked")
+    public T httpClient(OkHttpClient httpClient) {
         this.httpClient = httpClient;
-        return this;
+        return (T) this;
     }
 
     /**
@@ -99,14 +107,16 @@ public AsyncBaseClientBuilder httpClient(OkHttpClient httpClient) {
      * @param value The header value
      * @return This builder for method chaining
      */
-    public AsyncBaseClientBuilder addHeader(String name, String value) {
+    @SuppressWarnings("unchecked")
+    public T addHeader(String name, String value) {
         this.customHeaders.put(name, value);
-        return this;
+        return (T) this;
     }
 
-    public AsyncBaseClientBuilder projectId(String projectId) {
+    @SuppressWarnings("unchecked")
+    public T projectId(String projectId) {
         this.projectId = projectId;
-        return this;
+        return (T) this;
     }
 
     protected ClientOptions buildClientOptions() {

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

@@ -12,7 +12,7 @@
 import java.util.Optional;
 import okhttp3.OkHttpClient;
 
-public class BaseClientBuilder {
+public class BaseClientBuilder<T extends BaseClientBuilder<T>> {
     private Optional<Integer> timeout = Optional.empty();
 
     private Optional<Integer> maxRetries = Optional.empty();
@@ -35,60 +35,68 @@ public class BaseClientBuilder {
      * Sets clientId.
      * Defaults to the PIPEDREAM_CLIENT_ID environment variable.
      */
-    public BaseClientBuilder clientId(String clientId) {
+    @SuppressWarnings("unchecked")
+    public T clientId(String clientId) {
         this.clientId = clientId;
-        return this;
+        return (T) this;
     }
 
     /**
      * Sets clientSecret.
      * Defaults to the PIPEDREAM_CLIENT_SECRET environment variable.
      */
-    public BaseClientBuilder clientSecret(String clientSecret) {
+    @SuppressWarnings("unchecked")
+    public T clientSecret(String clientSecret) {
         this.clientSecret = clientSecret;
-        return this;
+        return (T) this;
     }
 
     /**
      * Sets projectEnvironment
      */
-    public BaseClientBuilder projectEnvironment(String projectEnvironment) {
+    @SuppressWarnings("unchecked")
+    public T projectEnvironment(String projectEnvironment) {
         this.projectEnvironment = projectEnvironment;
-        return this;
+        return (T) this;
     }
 
-    public BaseClientBuilder environment(Environment environment) {
+    @SuppressWarnings("unchecked")
+    public T environment(Environment environment) {
         this.environment = environment;
-        return this;
+        return (T) this;
     }
 
-    public BaseClientBuilder url(String url) {
+    @SuppressWarnings("unchecked")
+    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 BaseClientBuilder timeout(int timeout) {
+    @SuppressWarnings("unchecked")
+    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 BaseClientBuilder maxRetries(int maxRetries) {
+    @SuppressWarnings("unchecked")
+    public T maxRetries(int maxRetries) {
         this.maxRetries = Optional.of(maxRetries);
-        return this;
+        return (T) this;
     }
 
     /**
      * Sets the underlying OkHttp client
      */
-    public BaseClientBuilder httpClient(OkHttpClient httpClient) {
+    @SuppressWarnings("unchecked")
+    public T httpClient(OkHttpClient httpClient) {
         this.httpClient = httpClient;
-        return this;
+        return (T) this;
     }
 
     /**
@@ -99,14 +107,16 @@ public BaseClientBuilder httpClient(OkHttpClient httpClient) {
      * @param value The header value
      * @return This builder for method chaining
      */
-    public BaseClientBuilder addHeader(String name, String value) {
+    @SuppressWarnings("unchecked")
+    public T addHeader(String name, String value) {
         this.customHeaders.put(name, value);
-        return this;
+        return (T) this;
     }
 
-    public BaseClientBuilder projectId(String projectId) {
+    @SuppressWarnings("unchecked")
+    public T projectId(String projectId) {
         this.projectId = projectId;
-        return this;
+        return (T) this;
     }
 
     protected ClientOptions buildClientOptions() {