SDK regeneration

Author: fern-api[bot]

.fern/metadata.json

@@ -0,0 +1,12 @@
+{
+  "cliVersion": "2.6.2",
+  "generatorName": "fernapi/fern-java-sdk",
+  "generatorVersion": "3.18.11",
+  "generatorConfig": {
+    "publish-to": "central",
+    "client-class-name": "BaseClient",
+    "custom-dependencies": [
+      "api org.apache.commons:commons-text:1.13.1"
+    ]
+  }
+}

README.md

@@ -5,6 +5,22 @@
 
 The Pipedream Java library provides convenient access to the Pipedream APIs from Java.
 
+## Table of Contents
+
+- [Installation](#installation)
+- [Usage](#usage)
+- [Environments](#environments)
+- [Base Url](#base-url)
+- [Exception Handling](#exception-handling)
+- [Advanced](#advanced)
+  - [Custom Client](#custom-client)
+  - [Retries](#retries)
+  - [Timeouts](#timeouts)
+  - [Custom Headers](#custom-headers)
+  - [Access Raw Response Data](#access-raw-response-data)
+- [Contributing](#contributing)
+- [Reference](#reference)
+
 ## Installation
 
 ### Gradle
@@ -25,7 +41,7 @@ Add the dependency in your `pom.xml` file:
 <dependency>
   <groupId>com.pipedream</groupId>
   <artifactId>pipedream</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
 </dependency>
 ```
 
@@ -104,7 +120,7 @@ try{
 
 ### Custom Client
 
-This SDK is built to work with any instance of `OkHttpClient`. By default, if no client is provided, the SDK will construct one. 
+This SDK is built to work with any instance of `OkHttpClient`. By default, if no client is provided, the SDK will construct one.
 However, you can pass your own client like so:
 
 ```java
@@ -123,7 +139,9 @@ BaseClient client = BaseClient
 
 The SDK is instrumented with automatic retries with exponential backoff. A request will be retried as long
 as the request is deemed retryable and the number of retry attempts has not grown larger than the configured
-retry limit (default: 2).
+retry limit (default: 2). Before defaulting to exponential backoff, the SDK will first attempt to respect
+the `Retry-After` header (as either in seconds or as an HTTP date), and then the `X-RateLimit-Reset` header
+(as a Unix timestamp in epoch seconds); failing both of those, it will fall back to exponential backoff.
 
 A request is deemed retryable when any of the following HTTP status codes is returned:
 
@@ -192,6 +210,19 @@ client.actions().run(
 );
 ```
 
+### Access Raw Response Data
+
+The SDK provides access to raw response data, including headers, through the `withRawResponse()` method.
+The `withRawResponse()` method returns a raw client that wraps all responses with `body()` and `headers()` methods.
+(A normal client's `response` is identical to a raw client's `response.body()`.)
+
+```java
+RunHttpResponse response = client.actions().withRawResponse().run(...);
+
+System.out.println(response.body());
+System.out.println(response.headers().get("X-My-Header"));
+```
+
 ## Contributing
 
 While we value open-source contributions to this SDK, this library is generated programmatically.

build.gradle

@@ -14,15 +14,14 @@ repositories {
 }
 
 dependencies {
-    api 'com.squareup.okhttp3:okhttp:4.12.0'
-    api 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
-    api 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2'
-    api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2'
+    api 'com.squareup.okhttp3:okhttp:5.2.1'
+    api 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
+    api 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2'
+    api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
     api 'org.apache.commons:commons-text:1.13.1'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
 }
 
 
@@ -49,7 +48,7 @@ java {
 
 group = 'com.pipedream'
 
-version = '1.1.0'
+version = '1.1.1'
 
 jar {
     dependsOn(":generatePomFileForMavenPublication")
@@ -80,7 +79,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'com.pipedream'
             artifactId = 'pipedream'
-            version = '1.1.0'
+            version = '1.1.1'
             from components.java
             pom {
                 name = 'pipedream'

src/main/java/com/pipedream/api/core/BaseClientApiException.java

@@ -65,9 +65,9 @@ public Map<String, List<String>> headers() {
         return this.headers;
     }
 
-    @java.lang.Override
+    @Override
     public String toString() {
         return "BaseClientApiException{" + "message: " + getMessage() + ", statusCode: " + statusCode + ", body: "
-                + body + "}";
+                + ObjectMappers.stringify(body) + "}";
     }
 }

src/main/java/com/pipedream/api/core/ClientOptions.java

@@ -21,6 +21,8 @@ public final class ClientOptions {
 
     private final int timeout;
 
+    private final int maxRetries;
+
     private String projectId;
 
     private ClientOptions(
@@ -29,21 +31,23 @@ private ClientOptions(
             Map<String, Supplier<String>> headerSuppliers,
             OkHttpClient httpClient,
             int timeout,
+            int maxRetries,
             String projectId) {
         this.environment = environment;
         this.headers = new HashMap<>();
         this.headers.putAll(headers);
         this.headers.putAll(new HashMap<String, String>() {
             {
-                put("User-Agent", "com.pipedream:pipedream/1.1.0");
+                put("User-Agent", "com.pipedream:pipedream/1.1.1");
                 put("X-Fern-Language", "JAVA");
                 put("X-Fern-SDK-Name", "com.pipedream.fern:api-sdk");
-                put("X-Fern-SDK-Version", "1.1.0");
+                put("X-Fern-SDK-Version", "1.1.1");
             }
         });
         this.headerSuppliers = headerSuppliers;
         this.httpClient = httpClient;
         this.timeout = timeout;
+        this.maxRetries = maxRetries;
         this.projectId = projectId;
     }
 
@@ -86,6 +90,10 @@ public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) {
                 .build();
     }
 
+    public int maxRetries() {
+        return this.maxRetries;
+    }
+
     public String projectId() {
         return this.projectId;
     }
@@ -181,7 +189,13 @@ public ClientOptions build() {
             this.timeout = Optional.of(httpClient.callTimeoutMillis() / 1000);
 
             return new ClientOptions(
-                    environment, headers, headerSuppliers, httpClient, this.timeout.get(), this.projectId);
+                    environment,
+                    headers,
+                    headerSuppliers,
+                    httpClient,
+                    this.timeout.get(),
+                    this.maxRetries,
+                    this.projectId);
         }
 
         /**

src/main/java/com/pipedream/api/core/NullableNonemptyFilter.java

@@ -14,6 +14,9 @@ public boolean equals(Object o) {
     }
 
     private boolean isOptionalEmpty(Object o) {
-        return o instanceof Optional && !((Optional<?>) o).isPresent();
+        if (o instanceof Optional) {
+            return !((Optional<?>) o).isPresent();
+        }
+        return false;
     }
 }

src/main/java/com/pipedream/api/core/OAuthTokenSupplier.java

@@ -17,21 +17,30 @@ public final class OAuthTokenSupplier implements Supplier<String> {
 
     private final String clientSecret;
 
+    private final String grantType;
+
+    private final String scope;
+
     private final OauthTokensClient authClient;
 
     private String accessToken;
 
     private Instant expiresAt;
 
-    public OAuthTokenSupplier(String clientId, String clientSecret, OauthTokensClient authClient) {
+    public OAuthTokenSupplier(
+            String clientId, String clientSecret, String grantType, String scope, OauthTokensClient authClient) {
         this.clientId = clientId;
         this.clientSecret = clientSecret;
+        this.grantType = grantType;
+        this.scope = scope;
         this.authClient = authClient;
         this.expiresAt = Instant.now();
     }
 
     public CreateOAuthTokenResponse fetchToken() {
         CreateOAuthTokenOpts getTokenRequest = CreateOAuthTokenOpts.builder()
+                .grantType(grantType)
+                .scope(scope)
                 .clientId(clientId)
                 .clientSecret(clientSecret)
                 .build();

src/main/java/com/pipedream/api/core/ObjectMappers.java

@@ -4,6 +4,7 @@
 package com.pipedream.api.core;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -33,4 +34,12 @@ public static String stringify(Object o) {
             return o.getClass().getName() + "@" + Integer.toHexString(o.hashCode());
         }
     }
+
+    public static Object parseErrorBody(String responseBodyString) {
+        try {
+            return JSON_MAPPER.readValue(responseBodyString, Object.class);
+        } catch (JsonProcessingException ignored) {
+            return responseBodyString;
+        }
+    }
 }