diff --git a/.gradle/8.14.3/checksums/checksums.lock b/.gradle/8.14.3/checksums/checksums.lock index 3559036..865bf31 100644 Binary files a/.gradle/8.14.3/checksums/checksums.lock and b/.gradle/8.14.3/checksums/checksums.lock differ diff --git a/.gradle/8.14.3/checksums/md5-checksums.bin b/.gradle/8.14.3/checksums/md5-checksums.bin index 29542c0..2ff6479 100644 Binary files a/.gradle/8.14.3/checksums/md5-checksums.bin and b/.gradle/8.14.3/checksums/md5-checksums.bin differ diff --git a/.gradle/8.14.3/checksums/sha1-checksums.bin b/.gradle/8.14.3/checksums/sha1-checksums.bin index 54c347b..1b363d7 100644 Binary files a/.gradle/8.14.3/checksums/sha1-checksums.bin and b/.gradle/8.14.3/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.14.3/executionHistory/executionHistory.bin b/.gradle/8.14.3/executionHistory/executionHistory.bin index de05891..6c27e78 100644 Binary files a/.gradle/8.14.3/executionHistory/executionHistory.bin and b/.gradle/8.14.3/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.14.3/executionHistory/executionHistory.lock b/.gradle/8.14.3/executionHistory/executionHistory.lock index 803f780..001ff11 100644 Binary files a/.gradle/8.14.3/executionHistory/executionHistory.lock and b/.gradle/8.14.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.14.3/fileHashes/fileHashes.bin b/.gradle/8.14.3/fileHashes/fileHashes.bin index 805ddf7..a1432a9 100644 Binary files a/.gradle/8.14.3/fileHashes/fileHashes.bin and b/.gradle/8.14.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.14.3/fileHashes/fileHashes.lock b/.gradle/8.14.3/fileHashes/fileHashes.lock index 13bbe91..07662c1 100644 Binary files a/.gradle/8.14.3/fileHashes/fileHashes.lock and b/.gradle/8.14.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d45d667..b8b9285 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 8480c0b..8102a10 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Thu Jul 17 23:24:55 UTC 2025 +#Fri Jul 18 18:17:02 UTC 2025 gradle.version=8.14.3 diff --git a/README.md b/README.md index dc0abff..ef14162 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Add the dependency in your `pom.xml` file: com.pipedream pipedream - 0.0.202 + 0.0.216 ``` @@ -43,8 +43,7 @@ public class Example { public static void main(String[] args) { PipedreamApiClient client = PipedreamApiClient .builder() - .clientId("") - .clientSecret("") + .accessToken("") .build(); client.accounts().create( @@ -52,6 +51,8 @@ public class Example { CreateAccountRequest .builder() .appSlug("app_slug") + .cfmapJson("cfmap_json") + .connectToken("connect_token") .build() ); } diff --git a/build.gradle b/build.gradle index 75c5832..7616597 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ dependencies { 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 'org.apache.commons:commons-text:1.11.0' + api 'org.apache.commons:commons-text:1.13.1' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2' } @@ -47,7 +47,7 @@ java { group = 'com.pipedream' -version = '0.0.202' +version = '0.0.216' jar { dependsOn(":generatePomFileForMavenPublication") @@ -78,7 +78,7 @@ publishing { maven(MavenPublication) { groupId = 'com.pipedream' artifactId = 'pipedream' - version = '0.0.202' + version = '0.0.216' from components.java pom { name = 'pipedream' diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncPipedreamApiClientBuilder.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncPipedreamApiClientBuilder.java index 0ebee7b..f90180f 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncPipedreamApiClientBuilder.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncPipedreamApiClientBuilder.java @@ -5,36 +5,23 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.Environment; -import com.pipedream.api.core.OAuthTokenSupplier; -import com.pipedream.api.resources.oauthtokens.OauthTokensClient; import okhttp3.OkHttpClient; public final class AsyncPipedreamApiClientBuilder { private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); - private String clientId = System.getenv("PIPEDREAM_CLIENT_ID"); - - private String clientSecret = System.getenv("PIPEDREAM_CLIENT_SECRET"); + private String accessToken = System.getenv("PIPEDREAM_ACCESS_TOKEN"); private String projectEnvironment = null; private Environment environment = Environment.PROD; /** - * Sets clientId. - * Defaults to the PIPEDREAM_CLIENT_ID environment variable. - */ - public AsyncPipedreamApiClientBuilder clientId(String clientId) { - this.clientId = clientId; - return this; - } - - /** - * Sets clientSecret. - * Defaults to the PIPEDREAM_CLIENT_SECRET environment variable. + * Sets accessToken. + * Defaults to the PIPEDREAM_ACCESS_TOKEN environment variable. */ - public AsyncPipedreamApiClientBuilder clientSecret(String clientSecret) { - this.clientSecret = clientSecret; + public AsyncPipedreamApiClientBuilder accessToken(String accessToken) { + this.accessToken = accessToken; return this; } @@ -86,10 +73,7 @@ public AsyncPipedreamApiClientBuilder projectId(String projectId) { } public AsyncPipedreamApiClient build() { - OauthTokensClient authClient = new OauthTokensClient( - ClientOptions.builder().environment(this.environment).build()); - OAuthTokenSupplier oAuthTokenSupplier = new OAuthTokenSupplier(clientId, clientSecret, authClient); - this.clientOptionsBuilder.addHeader("Authorization", oAuthTokenSupplier); + this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.accessToken); if (projectEnvironment != null) { this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment); } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/PipedreamApiClientBuilder.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/PipedreamApiClientBuilder.java index 9983f98..048172a 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/PipedreamApiClientBuilder.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/PipedreamApiClientBuilder.java @@ -5,36 +5,23 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.Environment; -import com.pipedream.api.core.OAuthTokenSupplier; -import com.pipedream.api.resources.oauthtokens.OauthTokensClient; import okhttp3.OkHttpClient; public final class PipedreamApiClientBuilder { private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); - private String clientId = System.getenv("PIPEDREAM_CLIENT_ID"); - - private String clientSecret = System.getenv("PIPEDREAM_CLIENT_SECRET"); + private String accessToken = System.getenv("PIPEDREAM_ACCESS_TOKEN"); private String projectEnvironment = null; private Environment environment = Environment.PROD; /** - * Sets clientId. - * Defaults to the PIPEDREAM_CLIENT_ID environment variable. - */ - public PipedreamApiClientBuilder clientId(String clientId) { - this.clientId = clientId; - return this; - } - - /** - * Sets clientSecret. - * Defaults to the PIPEDREAM_CLIENT_SECRET environment variable. + * Sets accessToken. + * Defaults to the PIPEDREAM_ACCESS_TOKEN environment variable. */ - public PipedreamApiClientBuilder clientSecret(String clientSecret) { - this.clientSecret = clientSecret; + public PipedreamApiClientBuilder accessToken(String accessToken) { + this.accessToken = accessToken; return this; } @@ -86,10 +73,7 @@ public PipedreamApiClientBuilder projectId(String projectId) { } public PipedreamApiClient build() { - OauthTokensClient authClient = new OauthTokensClient( - ClientOptions.builder().environment(this.environment).build()); - OAuthTokenSupplier oAuthTokenSupplier = new OAuthTokenSupplier(clientId, clientSecret, authClient); - this.clientOptionsBuilder.addHeader("Authorization", oAuthTokenSupplier); + this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.accessToken); if (projectEnvironment != null) { this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment); } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/ClientOptions.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/ClientOptions.java index 5424c0d..738853c 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/ClientOptions.java +++ b/build/spotless/spotlessJava/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.202"); + put("X-Fern-SDK-Version", "0.0.216"); } }); this.headerSuppliers = headerSuppliers; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/OAuthTokenSupplier.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/OAuthTokenSupplier.java deleted file mode 100644 index ddbde79..0000000 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/OAuthTokenSupplier.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.core; - -import com.pipedream.api.resources.oauthtokens.OauthTokensClient; -import com.pipedream.api.resources.oauthtokens.requests.CreateOAuthTokenOpts; -import com.pipedream.api.types.CreateOAuthTokenResponse; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.function.Supplier; - -public final class OAuthTokenSupplier implements Supplier { - private static final long BUFFER_IN_MINUTES = 2; - - private final String clientId; - - private final String clientSecret; - - private final OauthTokensClient authClient; - - private String accessToken; - - private Instant expiresAt; - - public OAuthTokenSupplier(String clientId, String clientSecret, OauthTokensClient authClient) { - this.clientId = clientId; - this.clientSecret = clientSecret; - this.authClient = authClient; - this.expiresAt = Instant.now(); - } - - public CreateOAuthTokenResponse fetchToken() { - CreateOAuthTokenOpts getTokenRequest = CreateOAuthTokenOpts.builder() - .clientId(clientId) - .clientSecret(clientSecret) - .build(); - return authClient.create(getTokenRequest); - } - - @java.lang.Override - public String get() { - if (accessToken == null || expiresAt.isBefore(Instant.now())) { - CreateOAuthTokenResponse authResponse = fetchToken(); - this.accessToken = authResponse.getAccessToken(); - this.expiresAt = getExpiresAt(authResponse.getExpiresIn()); - } - return "Bearer " + accessToken; - } - - private Instant getExpiresAt(long expiresInSeconds) { - return Instant.now().plus(expiresInSeconds, ChronoUnit.SECONDS).minus(BUFFER_IN_MINUTES, ChronoUnit.MINUTES); - } -} diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiApiException.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientApiException.java similarity index 77% rename from build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiApiException.java rename to build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientApiException.java index d4d2e56..a593f29 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiApiException.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientApiException.java @@ -12,7 +12,7 @@ /** * This exception type will be thrown for any non-2XX API responses. */ -public class PipedreamApiApiException extends PipedreamApiException { +public class PipedreamApiClientApiException extends PipedreamApiClientException { /** * The error code of the response that triggered the exception. */ @@ -25,14 +25,14 @@ public class PipedreamApiApiException extends PipedreamApiException { private final Map> headers; - public PipedreamApiApiException(String message, int statusCode, Object body) { + public PipedreamApiClientApiException(String message, int statusCode, Object body) { super(message); this.statusCode = statusCode; this.body = body; this.headers = new HashMap<>(); } - public PipedreamApiApiException(String message, int statusCode, Object body, Response rawResponse) { + public PipedreamApiClientApiException(String message, int statusCode, Object body, Response rawResponse) { super(message); this.statusCode = statusCode; this.body = body; @@ -67,7 +67,7 @@ public Map> headers() { @java.lang.Override public String toString() { - return "PipedreamApiApiException{" + "message: " + getMessage() + ", statusCode: " + statusCode + ", body: " - + body + "}"; + return "PipedreamApiClientApiException{" + "message: " + getMessage() + ", statusCode: " + statusCode + + ", body: " + body + "}"; } } diff --git a/src/main/java/com/pipedream/api/core/PipedreamApiException.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientException.java similarity index 56% rename from src/main/java/com/pipedream/api/core/PipedreamApiException.java rename to build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientException.java index 866b47e..c7d02bb 100644 --- a/src/main/java/com/pipedream/api/core/PipedreamApiException.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientException.java @@ -6,12 +6,12 @@ /** * This class serves as the base exception for all errors in the SDK. */ -public class PipedreamApiException extends RuntimeException { - public PipedreamApiException(String message) { +public class PipedreamApiClientException extends RuntimeException { + public PipedreamApiClientException(String message) { super(message); } - public PipedreamApiException(String message, Exception e) { + public PipedreamApiClientException(String message, Exception e) { super(message, e); } } diff --git a/src/main/java/com/pipedream/api/core/PipedreamApiHttpResponse.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientHttpResponse.java similarity index 86% rename from src/main/java/com/pipedream/api/core/PipedreamApiHttpResponse.java rename to build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientHttpResponse.java index 59f2804..3744f56 100644 --- a/src/main/java/com/pipedream/api/core/PipedreamApiHttpResponse.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiClientHttpResponse.java @@ -9,13 +9,13 @@ import java.util.Map; import okhttp3.Response; -public final class PipedreamApiHttpResponse { +public final class PipedreamApiClientHttpResponse { private final T body; private final Map> headers; - public PipedreamApiHttpResponse(T body, Response rawResponse) { + public PipedreamApiClientHttpResponse(T body, Response rawResponse) { this.body = body; Map> headers = new HashMap<>(); diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/RequestOptions.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/RequestOptions.java index 559f48d..da2ac6a 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/RequestOptions.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/RequestOptions.java @@ -10,6 +10,8 @@ import java.util.function.Supplier; public final class RequestOptions { + private final String accessToken; + private final String projectEnvironment; private final Optional timeout; @@ -21,11 +23,13 @@ public final class RequestOptions { private final Map> headerSuppliers; private RequestOptions( + String accessToken, String projectEnvironment, Optional timeout, TimeUnit timeoutTimeUnit, Map headers, Map> headerSuppliers) { + this.accessToken = accessToken; this.projectEnvironment = projectEnvironment; this.timeout = timeout; this.timeoutTimeUnit = timeoutTimeUnit; @@ -43,6 +47,9 @@ public TimeUnit getTimeoutTimeUnit() { public Map getHeaders() { Map headers = new HashMap<>(); + if (this.accessToken != null) { + headers.put("Authorization", "Bearer " + this.accessToken); + } if (this.projectEnvironment != null) { headers.put("x-pd-environment", this.projectEnvironment); } @@ -58,6 +65,8 @@ public static Builder builder() { } public static final class Builder { + private String accessToken = null; + private String projectEnvironment = null; private Optional timeout = Optional.empty(); @@ -68,6 +77,11 @@ public static final class Builder { private final Map> headerSuppliers = new HashMap<>(); + public Builder accessToken(String accessToken) { + this.accessToken = accessToken; + return this; + } + public Builder projectEnvironment(String projectEnvironment) { this.projectEnvironment = projectEnvironment; return this; @@ -95,7 +109,8 @@ public Builder addHeader(String key, Supplier value) { } public RequestOptions build() { - return new RequestOptions(projectEnvironment, timeout, timeoutTimeUnit, headers, headerSuppliers); + return new RequestOptions( + accessToken, projectEnvironment, timeout, timeoutTimeUnit, headers, headerSuppliers); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java index 82dc947..3cf4d57 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -42,15 +42,16 @@ public AsyncRawAccountsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(AccountsListRequest.builder().build()); } - public CompletableFuture>> list(AccountsListRequest request) { + public CompletableFuture>> list( + AccountsListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( AccountsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -98,7 +99,8 @@ public CompletableFuture>> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -113,7 +115,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -127,30 +129,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> create(CreateAccountRequest request) { + public CompletableFuture> create(CreateAccountRequest request) { return create(request, null); } - public CompletableFuture> create( + public CompletableFuture> create( CreateAccountRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -171,9 +175,8 @@ public CompletableFuture> create( } Map properties = new HashMap<>(); properties.put("app_slug", request.getAppSlug()); - if (request.getCfmapJson().isPresent()) { - properties.put("cfmap_json", request.getCfmapJson()); - } + properties.put("cfmap_json", request.getCfmapJson()); + properties.put("connect_token", request.getConnectToken()); if (request.getName().isPresent()) { properties.put("name", request.getName()); } @@ -195,46 +198,48 @@ public CompletableFuture> create( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Account.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String accountId) { + public CompletableFuture> retrieve(String accountId) { return retrieve(accountId, AccountsRetrieveRequest.builder().build()); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String accountId, AccountsRetrieveRequest request) { return retrieve(accountId, request, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String accountId, AccountsRetrieveRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -259,41 +264,44 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Account.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> delete(String accountId) { + public CompletableFuture> delete(String accountId) { return delete(accountId, null); } - public CompletableFuture> delete(String accountId, RequestOptions requestOptions) { + public CompletableFuture> delete( + String accountId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -310,40 +318,43 @@ public CompletableFuture> delete(String accountId if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>(null, response)); + future.complete(new PipedreamApiClientHttpResponse<>(null, response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> deleteByApp(String appId) { + public CompletableFuture> deleteByApp(String appId) { return deleteByApp(appId, null); } - public CompletableFuture> deleteByApp(String appId, RequestOptions requestOptions) { + public CompletableFuture> deleteByApp( + String appId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -361,30 +372,32 @@ public CompletableFuture> deleteByApp(String appI if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>(null, response)); + future.complete(new PipedreamApiClientHttpResponse<>(null, response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java index ad4652d..7aef857 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -37,15 +37,15 @@ public RawAccountsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(AccountsListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(AccountsListRequest request) { + public PipedreamApiClientHttpResponse> list(AccountsListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( AccountsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -104,28 +104,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse create(CreateAccountRequest request) { + public PipedreamApiClientHttpResponse create(CreateAccountRequest request) { return create(request, null); } - public PipedreamApiHttpResponse create(CreateAccountRequest request, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse create(CreateAccountRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -145,9 +145,8 @@ public PipedreamApiHttpResponse create(CreateAccountRequest request, Re } Map properties = new HashMap<>(); properties.put("app_slug", request.getAppSlug()); - if (request.getCfmapJson().isPresent()) { - properties.put("cfmap_json", request.getCfmapJson()); - } + properties.put("cfmap_json", request.getCfmapJson()); + properties.put("connect_token", request.getConnectToken()); if (request.getName().isPresent()) { properties.put("name", request.getName()); } @@ -172,29 +171,29 @@ public PipedreamApiHttpResponse create(CreateAccountRequest request, Re try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Account.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String accountId) { + public PipedreamApiClientHttpResponse retrieve(String accountId) { return retrieve(accountId, AccountsRetrieveRequest.builder().build()); } - public PipedreamApiHttpResponse retrieve(String accountId, AccountsRetrieveRequest request) { + public PipedreamApiClientHttpResponse retrieve(String accountId, AccountsRetrieveRequest request) { return retrieve(accountId, request, null); } - public PipedreamApiHttpResponse retrieve( + public PipedreamApiClientHttpResponse retrieve( String accountId, AccountsRetrieveRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -222,25 +221,25 @@ public PipedreamApiHttpResponse retrieve( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Account.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse delete(String accountId) { + public PipedreamApiClientHttpResponse delete(String accountId) { return delete(accountId, null); } - public PipedreamApiHttpResponse delete(String accountId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse delete(String accountId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -260,24 +259,24 @@ public PipedreamApiHttpResponse delete(String accountId, RequestOptions re try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>(null, response); + return new PipedreamApiClientHttpResponse<>(null, response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse deleteByApp(String appId) { + public PipedreamApiClientHttpResponse deleteByApp(String appId) { return deleteByApp(appId, null); } - public PipedreamApiHttpResponse deleteByApp(String appId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse deleteByApp(String appId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -298,16 +297,16 @@ public PipedreamApiHttpResponse deleteByApp(String appId, RequestOptions r try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>(null, response); + return new PipedreamApiClientHttpResponse<>(null, response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java index fe25bb8..aeec52a 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java @@ -29,7 +29,9 @@ public final class CreateAccountRequest { private final String appSlug; - private final Optional cfmapJson; + private final String cfmapJson; + + private final String connectToken; private final Optional name; @@ -40,7 +42,8 @@ private CreateAccountRequest( Optional externalUserId, Optional oauthAppId, String appSlug, - Optional cfmapJson, + String cfmapJson, + String connectToken, Optional name, Map additionalProperties) { this.appId = appId; @@ -48,6 +51,7 @@ private CreateAccountRequest( this.oauthAppId = oauthAppId; this.appSlug = appSlug; this.cfmapJson = cfmapJson; + this.connectToken = connectToken; this.name = name; this.additionalProperties = additionalProperties; } @@ -85,10 +89,18 @@ public String getAppSlug() { * @return JSON string containing the custom fields mapping */ @JsonProperty("cfmap_json") - public Optional getCfmapJson() { + public String getCfmapJson() { return cfmapJson; } + /** + * @return The connect token for authentication + */ + @JsonProperty("connect_token") + public String getConnectToken() { + return connectToken; + } + /** * @return Optional name for the account */ @@ -114,12 +126,20 @@ private boolean equalTo(CreateAccountRequest other) { && oauthAppId.equals(other.oauthAppId) && appSlug.equals(other.appSlug) && cfmapJson.equals(other.cfmapJson) + && connectToken.equals(other.connectToken) && name.equals(other.name); } @java.lang.Override public int hashCode() { - return Objects.hash(this.appId, this.externalUserId, this.oauthAppId, this.appSlug, this.cfmapJson, this.name); + return Objects.hash( + this.appId, + this.externalUserId, + this.oauthAppId, + this.appSlug, + this.cfmapJson, + this.connectToken, + this.name); } @java.lang.Override @@ -135,11 +155,25 @@ public interface AppSlugStage { /** *

The app slug for the account

*/ - _FinalStage appSlug(@NotNull String appSlug); + CfmapJsonStage appSlug(@NotNull String appSlug); Builder from(CreateAccountRequest other); } + public interface CfmapJsonStage { + /** + *

JSON string containing the custom fields mapping

+ */ + ConnectTokenStage cfmapJson(@NotNull String cfmapJson); + } + + public interface ConnectTokenStage { + /** + *

The connect token for authentication

+ */ + _FinalStage connectToken(@NotNull String connectToken); + } + public interface _FinalStage { CreateAccountRequest build(); @@ -161,13 +195,6 @@ public interface _FinalStage { _FinalStage oauthAppId(String oauthAppId); - /** - *

JSON string containing the custom fields mapping

- */ - _FinalStage cfmapJson(Optional cfmapJson); - - _FinalStage cfmapJson(String cfmapJson); - /** *

Optional name for the account

*/ @@ -177,12 +204,14 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements AppSlugStage, _FinalStage { + public static final class Builder implements AppSlugStage, CfmapJsonStage, ConnectTokenStage, _FinalStage { private String appSlug; - private Optional name = Optional.empty(); + private String cfmapJson; - private Optional cfmapJson = Optional.empty(); + private String connectToken; + + private Optional name = Optional.empty(); private Optional oauthAppId = Optional.empty(); @@ -202,6 +231,7 @@ public Builder from(CreateAccountRequest other) { oauthAppId(other.getOauthAppId()); appSlug(other.getAppSlug()); cfmapJson(other.getCfmapJson()); + connectToken(other.getConnectToken()); name(other.getName()); return this; } @@ -213,48 +243,52 @@ public Builder from(CreateAccountRequest other) { */ @java.lang.Override @JsonSetter("app_slug") - public _FinalStage appSlug(@NotNull String appSlug) { + public CfmapJsonStage appSlug(@NotNull String appSlug) { this.appSlug = Objects.requireNonNull(appSlug, "appSlug must not be null"); return this; } /** - *

Optional name for the account

+ *

JSON string containing the custom fields mapping

+ *

JSON string containing the custom fields mapping

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - public _FinalStage name(String name) { - this.name = Optional.ofNullable(name); + @JsonSetter("cfmap_json") + public ConnectTokenStage cfmapJson(@NotNull String cfmapJson) { + this.cfmapJson = Objects.requireNonNull(cfmapJson, "cfmapJson must not be null"); return this; } /** - *

Optional name for the account

+ *

The connect token for authentication

+ *

The connect token for authentication

+ * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter(value = "name", nulls = Nulls.SKIP) - public _FinalStage name(Optional name) { - this.name = name; + @JsonSetter("connect_token") + public _FinalStage connectToken(@NotNull String connectToken) { + this.connectToken = Objects.requireNonNull(connectToken, "connectToken must not be null"); return this; } /** - *

JSON string containing the custom fields mapping

+ *

Optional name for the account

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - public _FinalStage cfmapJson(String cfmapJson) { - this.cfmapJson = Optional.ofNullable(cfmapJson); + public _FinalStage name(String name) { + this.name = Optional.ofNullable(name); return this; } /** - *

JSON string containing the custom fields mapping

+ *

Optional name for the account

*/ @java.lang.Override - @JsonSetter(value = "cfmap_json", nulls = Nulls.SKIP) - public _FinalStage cfmapJson(Optional cfmapJson) { - this.cfmapJson = cfmapJson; + @JsonSetter(value = "name", nulls = Nulls.SKIP) + public _FinalStage name(Optional name) { + this.name = name; return this; } @@ -314,7 +348,7 @@ public _FinalStage appId(Optional appId) { @java.lang.Override public CreateAccountRequest build() { return new CreateAccountRequest( - appId, externalUserId, oauthAppId, appSlug, cfmapJson, name, additionalProperties); + appId, externalUserId, oauthAppId, appSlug, cfmapJson, connectToken, name, additionalProperties); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java index 9686990..b260c12 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -47,15 +47,16 @@ public AsyncRawActionsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(ActionsListRequest.builder().build()); } - public CompletableFuture>> list(ActionsListRequest request) { + public CompletableFuture>> list( + ActionsListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( ActionsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -90,7 +91,8 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -105,7 +107,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -119,30 +121,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String componentId) { + public CompletableFuture> retrieve(String componentId) { return retrieve(componentId, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -161,7 +165,7 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -169,35 +173,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( ActionsConfigurePropRequest request) { return configureProp(request, null); } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( ActionsConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -226,43 +232,45 @@ public CompletableFuture> config if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( ActionsReloadPropsRequest request) { return reloadProps(request, null); } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( ActionsReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -291,42 +299,44 @@ public CompletableFuture> reloadPr if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> run(RunActionOpts request) { + public CompletableFuture> run(RunActionOpts request) { return run(request, null); } - public CompletableFuture> run( + public CompletableFuture> run( RunActionOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -364,32 +374,34 @@ public CompletableFuture> run( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), RunActionResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java index eee1aa6..4739375 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -42,15 +42,15 @@ public RawActionsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(ActionsListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(ActionsListRequest request) { + public PipedreamApiClientHttpResponse> list(ActionsListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( ActionsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -96,28 +96,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String componentId) { + public PipedreamApiClientHttpResponse retrieve(String componentId) { return retrieve(componentId, null); } - public PipedreamApiHttpResponse retrieve(String componentId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -140,24 +140,24 @@ public PipedreamApiHttpResponse retrieve(String componentId, RequestO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse configureProp(ActionsConfigurePropRequest request) { + public PipedreamApiClientHttpResponse configureProp(ActionsConfigurePropRequest request) { return configureProp(request, null); } - public PipedreamApiHttpResponse configureProp( + public PipedreamApiClientHttpResponse configureProp( ActionsConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -189,26 +189,26 @@ public PipedreamApiHttpResponse configureProp( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse reloadProps(ActionsReloadPropsRequest request) { + public PipedreamApiClientHttpResponse reloadProps(ActionsReloadPropsRequest request) { return reloadProps(request, null); } - public PipedreamApiHttpResponse reloadProps( + public PipedreamApiClientHttpResponse reloadProps( ActionsReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -240,26 +240,26 @@ public PipedreamApiHttpResponse reloadProps( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse run(RunActionOpts request) { + public PipedreamApiClientHttpResponse run(RunActionOpts request) { return run(request, null); } - public PipedreamApiHttpResponse run(RunActionOpts request, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse run(RunActionOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -299,17 +299,17 @@ public PipedreamApiHttpResponse run(RunActionOpts request, Re try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), RunActionResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/appcategories/AsyncRawAppCategoriesClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/appcategories/AsyncRawAppCategoriesClient.java index c7a7bf5..3bdfe9c 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/appcategories/AsyncRawAppCategoriesClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/appcategories/AsyncRawAppCategoriesClient.java @@ -6,9 +6,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.types.AppCategory; import java.io.IOException; @@ -31,11 +31,11 @@ public AsyncRawAppCategoriesClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(null); } - public CompletableFuture>> list(RequestOptions requestOptions) { + public CompletableFuture>> list(RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/app_categories") @@ -50,43 +50,46 @@ public CompletableFuture>> list(Reque if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String id) { + public CompletableFuture> retrieve(String id) { return retrieve(id, null); } - public CompletableFuture> retrieve(String id, RequestOptions requestOptions) { + public CompletableFuture> retrieve( + String id, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/app_categories") @@ -102,32 +105,34 @@ public CompletableFuture> retrieve(String if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), AppCategory.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/appcategories/RawAppCategoriesClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/appcategories/RawAppCategoriesClient.java index 497bd77..46fa62f 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/appcategories/RawAppCategoriesClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/appcategories/RawAppCategoriesClient.java @@ -6,9 +6,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.types.AppCategory; import java.io.IOException; @@ -27,11 +27,11 @@ public RawAppCategoriesClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(null); } - public PipedreamApiHttpResponse> list(RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse> list(RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/app_categories") @@ -49,27 +49,27 @@ public PipedreamApiHttpResponse> list(RequestOptions requestOp try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String id) { + public PipedreamApiClientHttpResponse retrieve(String id) { return retrieve(id, null); } - public PipedreamApiHttpResponse retrieve(String id, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String id, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/app_categories") @@ -88,17 +88,17 @@ public PipedreamApiHttpResponse retrieve(String id, RequestOptions try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), AppCategory.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/apps/AsyncRawAppsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/apps/AsyncRawAppsClient.java index 42967c0..9146023 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/apps/AsyncRawAppsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/apps/AsyncRawAppsClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -37,15 +37,15 @@ public AsyncRawAppsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(AppsListRequest.builder().build()); } - public CompletableFuture>> list(AppsListRequest request) { + public CompletableFuture>> list(AppsListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( AppsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -87,7 +87,7 @@ public CompletableFuture>> list if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -102,7 +102,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -116,30 +116,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String appId) { + public CompletableFuture> retrieve(String appId) { return retrieve(appId, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String appId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -156,32 +158,34 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetAppResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/apps/RawAppsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/apps/RawAppsClient.java index 37619d9..a65d416 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/apps/RawAppsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/apps/RawAppsClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -32,15 +32,15 @@ public RawAppsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(AppsListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(AppsListRequest request) { + public PipedreamApiClientHttpResponse> list(AppsListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( AppsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -93,28 +93,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String appId) { + public PipedreamApiClientHttpResponse retrieve(String appId) { return retrieve(appId, null); } - public PipedreamApiHttpResponse retrieve(String appId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String appId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/apps") @@ -133,17 +133,17 @@ public PipedreamApiHttpResponse retrieve(String appId, RequestOp try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetAppResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java index 43e8178..677e973 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -43,16 +43,16 @@ public AsyncRawComponentsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(ComponentsListRequest.builder().build()); } - public CompletableFuture>> list( + public CompletableFuture>> list( ComponentsListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( ComponentsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -87,7 +87,8 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -102,7 +103,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -116,30 +117,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String componentId) { + public CompletableFuture> retrieve(String componentId) { return retrieve(componentId, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -158,7 +161,7 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -166,35 +169,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( ComponentsConfigurePropRequest request) { return configureProp(request, null); } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( ComponentsConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -223,43 +228,45 @@ public CompletableFuture> config if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( ComponentsReloadPropsRequest request) { return reloadProps(request, null); } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( ComponentsReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -288,32 +295,34 @@ public CompletableFuture> reloadPr if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java index cd8521d..a02f145 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -38,15 +38,15 @@ public RawComponentsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(ComponentsListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(ComponentsListRequest request) { + public PipedreamApiClientHttpResponse> list(ComponentsListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( ComponentsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -92,28 +92,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String componentId) { + public PipedreamApiClientHttpResponse retrieve(String componentId) { return retrieve(componentId, null); } - public PipedreamApiHttpResponse retrieve(String componentId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -136,24 +136,24 @@ public PipedreamApiHttpResponse retrieve(String componentId, RequestO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse configureProp(ComponentsConfigurePropRequest request) { + public PipedreamApiClientHttpResponse configureProp(ComponentsConfigurePropRequest request) { return configureProp(request, null); } - public PipedreamApiHttpResponse configureProp( + public PipedreamApiClientHttpResponse configureProp( ComponentsConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -185,26 +185,26 @@ public PipedreamApiHttpResponse configureProp( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse reloadProps(ComponentsReloadPropsRequest request) { + public PipedreamApiClientHttpResponse reloadProps(ComponentsReloadPropsRequest request) { return reloadProps(request, null); } - public PipedreamApiHttpResponse reloadProps( + public PipedreamApiClientHttpResponse reloadProps( ComponentsReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -236,18 +236,18 @@ public PipedreamApiHttpResponse reloadProps( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/deployedtriggers/AsyncRawDeployedTriggersClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/deployedtriggers/AsyncRawDeployedTriggersClient.java index cbee597..ee7fe6b 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/deployedtriggers/AsyncRawDeployedTriggersClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/deployedtriggers/AsyncRawDeployedTriggersClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -53,12 +53,12 @@ public AsyncRawDeployedTriggersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list( + public CompletableFuture>> list( DeployedTriggersListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( DeployedTriggersListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -88,7 +88,7 @@ public CompletableFuture>> future = + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override @@ -104,7 +104,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -118,31 +118,33 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String triggerId, DeployedTriggersRetrieveRequest request) { return retrieve(triggerId, request, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String triggerId, DeployedTriggersRetrieveRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -161,7 +163,7 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -169,35 +171,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> update( + public CompletableFuture> update( String triggerId, UpdateTriggerOpts request) { return update(triggerId, request, null); } - public CompletableFuture> update( + public CompletableFuture> update( String triggerId, UpdateTriggerOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -234,7 +238,7 @@ public CompletableFuture> update( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -242,35 +246,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> delete( + public CompletableFuture> delete( String triggerId, DeployedTriggersDeleteRequest request) { return delete(triggerId, request, null); } - public CompletableFuture> delete( + public CompletableFuture> delete( String triggerId, DeployedTriggersDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -292,41 +298,43 @@ public CompletableFuture> delete( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>(null, response)); + future.complete(new PipedreamApiClientHttpResponse<>(null, response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> listEvents( + public CompletableFuture>> listEvents( String triggerId, DeployedTriggersListEventsRequest request) { return listEvents(triggerId, request, null); } - public CompletableFuture>> listEvents( + public CompletableFuture>> listEvents( String triggerId, DeployedTriggersListEventsRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -349,7 +357,7 @@ public CompletableFuture>> listEvent if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -357,35 +365,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetTriggerEventsResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerEventsResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> listWorkflows( + public CompletableFuture> listWorkflows( String triggerId, DeployedTriggersListWorkflowsRequest request) { return listWorkflows(triggerId, request, null); } - public CompletableFuture> listWorkflows( + public CompletableFuture> listWorkflows( String triggerId, DeployedTriggersListWorkflowsRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -405,44 +415,47 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerWorkflowsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> updateWorkflows( + public CompletableFuture> updateWorkflows( String triggerId, UpdateTriggerWorkflowsOpts request) { return updateWorkflows(triggerId, request, null); } - public CompletableFuture> updateWorkflows( + public CompletableFuture> updateWorkflows( String triggerId, UpdateTriggerWorkflowsOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -472,44 +485,47 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerWorkflowsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> listWebhooks( + public CompletableFuture> listWebhooks( String triggerId, DeployedTriggersListWebhooksRequest request) { return listWebhooks(triggerId, request, null); } - public CompletableFuture> listWebhooks( + public CompletableFuture> listWebhooks( String triggerId, DeployedTriggersListWebhooksRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -529,44 +545,47 @@ public CompletableFuture> l if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerWebhooksResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> updateWebhooks( + public CompletableFuture> updateWebhooks( String triggerId, UpdateTriggerWebhooksOpts request) { return updateWebhooks(triggerId, request, null); } - public CompletableFuture> updateWebhooks( + public CompletableFuture> updateWebhooks( String triggerId, UpdateTriggerWebhooksOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -596,33 +615,36 @@ public CompletableFuture> u if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerWebhooksResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/deployedtriggers/RawDeployedTriggersClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/deployedtriggers/RawDeployedTriggersClient.java index 0e1e09f..6089582 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/deployedtriggers/RawDeployedTriggersClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/deployedtriggers/RawDeployedTriggersClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -48,11 +48,12 @@ public RawDeployedTriggersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list(DeployedTriggersListRequest request) { + public PipedreamApiClientHttpResponse> list( + DeployedTriggersListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( DeployedTriggersListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -93,29 +94,29 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve( + public PipedreamApiClientHttpResponse retrieve( String triggerId, DeployedTriggersRetrieveRequest request) { return retrieve(triggerId, request, null); } - public PipedreamApiHttpResponse retrieve( + public PipedreamApiClientHttpResponse retrieve( String triggerId, DeployedTriggersRetrieveRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -139,24 +140,24 @@ public PipedreamApiHttpResponse retrieve( if (response.isSuccessful()) { GetTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse update(String triggerId, UpdateTriggerOpts request) { + public PipedreamApiClientHttpResponse update(String triggerId, UpdateTriggerOpts request) { return update(triggerId, request, null); } - public PipedreamApiHttpResponse update( + public PipedreamApiClientHttpResponse update( String triggerId, UpdateTriggerOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -198,24 +199,24 @@ public PipedreamApiHttpResponse update( if (response.isSuccessful()) { GetTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse delete(String triggerId, DeployedTriggersDeleteRequest request) { + public PipedreamApiClientHttpResponse delete(String triggerId, DeployedTriggersDeleteRequest request) { return delete(triggerId, request, null); } - public PipedreamApiHttpResponse delete( + public PipedreamApiClientHttpResponse delete( String triggerId, DeployedTriggersDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -240,25 +241,25 @@ public PipedreamApiHttpResponse delete( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>(null, response); + return new PipedreamApiClientHttpResponse<>(null, response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> listEvents( + public PipedreamApiClientHttpResponse> listEvents( String triggerId, DeployedTriggersListEventsRequest request) { return listEvents(triggerId, request, null); } - public PipedreamApiHttpResponse> listEvents( + public PipedreamApiClientHttpResponse> listEvents( String triggerId, DeployedTriggersListEventsRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -286,25 +287,25 @@ public PipedreamApiHttpResponse> listEvents( if (response.isSuccessful()) { GetTriggerEventsResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerEventsResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse listWorkflows( + public PipedreamApiClientHttpResponse listWorkflows( String triggerId, DeployedTriggersListWorkflowsRequest request) { return listWorkflows(triggerId, request, null); } - public PipedreamApiHttpResponse listWorkflows( + public PipedreamApiClientHttpResponse listWorkflows( String triggerId, DeployedTriggersListWorkflowsRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -327,27 +328,27 @@ public PipedreamApiHttpResponse listWorkflows( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerWorkflowsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse updateWorkflows( + public PipedreamApiClientHttpResponse updateWorkflows( String triggerId, UpdateTriggerWorkflowsOpts request) { return updateWorkflows(triggerId, request, null); } - public PipedreamApiHttpResponse updateWorkflows( + public PipedreamApiClientHttpResponse updateWorkflows( String triggerId, UpdateTriggerWorkflowsOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -380,27 +381,27 @@ public PipedreamApiHttpResponse updateWorkflows( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerWorkflowsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse listWebhooks( + public PipedreamApiClientHttpResponse listWebhooks( String triggerId, DeployedTriggersListWebhooksRequest request) { return listWebhooks(triggerId, request, null); } - public PipedreamApiHttpResponse listWebhooks( + public PipedreamApiClientHttpResponse listWebhooks( String triggerId, DeployedTriggersListWebhooksRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -423,27 +424,27 @@ public PipedreamApiHttpResponse listWebhooks( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerWebhooksResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse updateWebhooks( + public PipedreamApiClientHttpResponse updateWebhooks( String triggerId, UpdateTriggerWebhooksOpts request) { return updateWebhooks(triggerId, request, null); } - public PipedreamApiHttpResponse updateWebhooks( + public PipedreamApiClientHttpResponse updateWebhooks( String triggerId, UpdateTriggerWebhooksOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -476,18 +477,18 @@ public PipedreamApiHttpResponse updateWebhooks( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerWebhooksResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/oauthtokens/AsyncRawOauthTokensClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/oauthtokens/AsyncRawOauthTokensClient.java index cc29bb8..06c6f28 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/oauthtokens/AsyncRawOauthTokensClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/oauthtokens/AsyncRawOauthTokensClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.oauthtokens.requests.CreateOAuthTokenOpts; import com.pipedream.api.types.CreateOAuthTokenResponse; @@ -33,11 +33,12 @@ public AsyncRawOauthTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> create(CreateOAuthTokenOpts request) { + public CompletableFuture> create( + CreateOAuthTokenOpts request) { return create(request, null); } - public CompletableFuture> create( + public CompletableFuture> create( CreateOAuthTokenOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -48,7 +49,7 @@ public CompletableFuture> cre body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -61,33 +62,35 @@ public CompletableFuture> cre if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), CreateOAuthTokenResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/oauthtokens/RawOauthTokensClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/oauthtokens/RawOauthTokensClient.java index c7096b4..c6299e2 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/oauthtokens/RawOauthTokensClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/oauthtokens/RawOauthTokensClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.oauthtokens.requests.CreateOAuthTokenOpts; import com.pipedream.api.types.CreateOAuthTokenResponse; @@ -29,11 +29,11 @@ public RawOauthTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse create(CreateOAuthTokenOpts request) { + public PipedreamApiClientHttpResponse create(CreateOAuthTokenOpts request) { return create(request, null); } - public PipedreamApiHttpResponse create( + public PipedreamApiClientHttpResponse create( CreateOAuthTokenOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -44,7 +44,7 @@ public PipedreamApiHttpResponse create( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -60,18 +60,18 @@ public PipedreamApiHttpResponse create( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CreateOAuthTokenResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/projects/AsyncRawProjectsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/projects/AsyncRawProjectsClient.java index df37ce8..c322367 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/projects/AsyncRawProjectsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/projects/AsyncRawProjectsClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.types.ProjectInfoResponse; import java.io.IOException; @@ -29,11 +29,11 @@ public AsyncRawProjectsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> retrieveInfo() { + public CompletableFuture> retrieveInfo() { return retrieveInfo(null); } - public CompletableFuture> retrieveInfo( + public CompletableFuture> retrieveInfo( RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -51,32 +51,34 @@ public CompletableFuture> retrieve if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ProjectInfoResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/projects/RawProjectsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/projects/RawProjectsClient.java index d09dc32..3f81535 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/projects/RawProjectsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/projects/RawProjectsClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.types.ProjectInfoResponse; import java.io.IOException; @@ -25,11 +25,11 @@ public RawProjectsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse retrieveInfo() { + public PipedreamApiClientHttpResponse retrieveInfo() { return retrieveInfo(null); } - public PipedreamApiHttpResponse retrieveInfo(RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieveInfo(RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -49,18 +49,18 @@ public PipedreamApiHttpResponse retrieveInfo(RequestOptions try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ProjectInfoResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java index d6737d6..442e357 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.proxy.requests.ProxyDeleteRequest; @@ -38,11 +38,12 @@ public AsyncRawProxyClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> get(String url64, ProxyGetRequest request) { + public CompletableFuture>> get( + String url64, ProxyGetRequest request) { return get(url64, request, null); } - public CompletableFuture>> get( + public CompletableFuture>> get( String url64, ProxyGetRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -62,44 +63,46 @@ public CompletableFuture>> get( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> post( + public CompletableFuture>> post( String url64, ProxyPostRequest request) { return post(url64, request, null); } - public CompletableFuture>> post( + public CompletableFuture>> post( String url64, ProxyPostRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -127,43 +130,46 @@ public CompletableFuture>> post( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> put(String url64, ProxyPutRequest request) { + public CompletableFuture>> put( + String url64, ProxyPutRequest request) { return put(url64, request, null); } - public CompletableFuture>> put( + public CompletableFuture>> put( String url64, ProxyPutRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -191,44 +197,46 @@ public CompletableFuture>> put( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> delete( + public CompletableFuture>> delete( String url64, ProxyDeleteRequest request) { return delete(url64, request, null); } - public CompletableFuture>> delete( + public CompletableFuture>> delete( String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -248,44 +256,46 @@ public CompletableFuture>> delete( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> patch( + public CompletableFuture>> patch( String url64, ProxyPatchRequest request) { return patch(url64, request, null); } - public CompletableFuture>> patch( + public CompletableFuture>> patch( String url64, ProxyPatchRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -313,33 +323,35 @@ public CompletableFuture>> patch( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java index 9720f2b..122e2a8 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.proxy.requests.ProxyDeleteRequest; @@ -34,11 +34,11 @@ public RawProxyClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> get(String url64, ProxyGetRequest request) { + public PipedreamApiClientHttpResponse> get(String url64, ProxyGetRequest request) { return get(url64, request, null); } - public PipedreamApiHttpResponse> get( + public PipedreamApiClientHttpResponse> get( String url64, ProxyGetRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -61,27 +61,27 @@ public PipedreamApiHttpResponse> get( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> post(String url64, ProxyPostRequest request) { + public PipedreamApiClientHttpResponse> post(String url64, ProxyPostRequest request) { return post(url64, request, null); } - public PipedreamApiHttpResponse> post( + public PipedreamApiClientHttpResponse> post( String url64, ProxyPostRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -112,27 +112,27 @@ public PipedreamApiHttpResponse> post( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> put(String url64, ProxyPutRequest request) { + public PipedreamApiClientHttpResponse> put(String url64, ProxyPutRequest request) { return put(url64, request, null); } - public PipedreamApiHttpResponse> put( + public PipedreamApiClientHttpResponse> put( String url64, ProxyPutRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -163,27 +163,27 @@ public PipedreamApiHttpResponse> put( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> delete(String url64, ProxyDeleteRequest request) { + public PipedreamApiClientHttpResponse> delete(String url64, ProxyDeleteRequest request) { return delete(url64, request, null); } - public PipedreamApiHttpResponse> delete( + public PipedreamApiClientHttpResponse> delete( String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -206,27 +206,27 @@ public PipedreamApiHttpResponse> delete( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> patch(String url64, ProxyPatchRequest request) { + public PipedreamApiClientHttpResponse> patch(String url64, ProxyPatchRequest request) { return patch(url64, request, null); } - public PipedreamApiHttpResponse> patch( + public PipedreamApiClientHttpResponse> patch( String url64, ProxyPatchRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -257,19 +257,19 @@ public PipedreamApiHttpResponse> patch( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java index 9ddd525..ff1385f 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; @@ -36,11 +36,11 @@ public AsyncRawTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> create(CreateTokenRequest request) { + public CompletableFuture> create(CreateTokenRequest request) { return create(request, null); } - public CompletableFuture> create( + public CompletableFuture> create( CreateTokenRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -51,7 +51,7 @@ public CompletableFuture> create( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -64,47 +64,49 @@ public CompletableFuture> create( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CreateTokenResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> validate(String ctok) { + public CompletableFuture> validate(String ctok) { return validate(ctok, TokensValidateRequest.builder().build()); } - public CompletableFuture> validate( + public CompletableFuture> validate( String ctok, TokensValidateRequest request) { return validate(ctok, request, null); } - public CompletableFuture> validate( + public CompletableFuture> validate( String ctok, TokensValidateRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -125,32 +127,34 @@ public CompletableFuture> valida if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ValidateTokenResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java index d20fbea..7e5ef32 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; @@ -32,11 +32,11 @@ public RawTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse create(CreateTokenRequest request) { + public PipedreamApiClientHttpResponse create(CreateTokenRequest request) { return create(request, null); } - public PipedreamApiHttpResponse create( + public PipedreamApiClientHttpResponse create( CreateTokenRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -47,7 +47,7 @@ public PipedreamApiHttpResponse create( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -63,30 +63,30 @@ public PipedreamApiHttpResponse create( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CreateTokenResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse validate(String ctok) { + public PipedreamApiClientHttpResponse validate(String ctok) { return validate(ctok, TokensValidateRequest.builder().build()); } - public PipedreamApiHttpResponse validate(String ctok, TokensValidateRequest request) { + public PipedreamApiClientHttpResponse validate(String ctok, TokensValidateRequest request) { return validate(ctok, request, null); } - public PipedreamApiHttpResponse validate( + public PipedreamApiClientHttpResponse validate( String ctok, TokensValidateRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -110,18 +110,18 @@ public PipedreamApiHttpResponse validate( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ValidateTokenResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/triggers/AsyncRawTriggersClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/triggers/AsyncRawTriggersClient.java index 8e4c08a..7574841 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/triggers/AsyncRawTriggersClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/triggers/AsyncRawTriggersClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -47,16 +47,16 @@ public AsyncRawTriggersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(TriggersListRequest.builder().build()); } - public CompletableFuture>> list( + public CompletableFuture>> list( TriggersListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( TriggersListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -91,7 +91,8 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -106,7 +107,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -120,30 +121,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String componentId) { + public CompletableFuture> retrieve(String componentId) { return retrieve(componentId, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -162,7 +165,7 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -170,35 +173,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( TriggersConfigurePropRequest request) { return configureProp(request, null); } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( TriggersConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -227,43 +232,45 @@ public CompletableFuture> config if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( TriggersReloadPropsRequest request) { return reloadProps(request, null); } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( TriggersReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -292,42 +299,44 @@ public CompletableFuture> reloadPr if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> deploy(DeployTriggerOpts request) { + public CompletableFuture> deploy(DeployTriggerOpts request) { return deploy(request, null); } - public CompletableFuture> deploy( + public CompletableFuture> deploy( DeployTriggerOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -340,7 +349,7 @@ public CompletableFuture> deploy( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -353,7 +362,7 @@ public CompletableFuture> deploy( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -361,24 +370,26 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { DeployTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), DeployTriggerResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/triggers/RawTriggersClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/triggers/RawTriggersClient.java index 83abd08..d2d1eb0 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/triggers/RawTriggersClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/triggers/RawTriggersClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -42,15 +42,15 @@ public RawTriggersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(TriggersListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(TriggersListRequest request) { + public PipedreamApiClientHttpResponse> list(TriggersListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( TriggersListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -96,28 +96,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String componentId) { + public PipedreamApiClientHttpResponse retrieve(String componentId) { return retrieve(componentId, null); } - public PipedreamApiHttpResponse retrieve(String componentId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -140,24 +140,24 @@ public PipedreamApiHttpResponse retrieve(String componentId, RequestO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse configureProp(TriggersConfigurePropRequest request) { + public PipedreamApiClientHttpResponse configureProp(TriggersConfigurePropRequest request) { return configureProp(request, null); } - public PipedreamApiHttpResponse configureProp( + public PipedreamApiClientHttpResponse configureProp( TriggersConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -189,26 +189,26 @@ public PipedreamApiHttpResponse configureProp( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse reloadProps(TriggersReloadPropsRequest request) { + public PipedreamApiClientHttpResponse reloadProps(TriggersReloadPropsRequest request) { return reloadProps(request, null); } - public PipedreamApiHttpResponse reloadProps( + public PipedreamApiClientHttpResponse reloadProps( TriggersReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -240,26 +240,26 @@ public PipedreamApiHttpResponse reloadProps( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse deploy(DeployTriggerOpts request) { + public PipedreamApiClientHttpResponse deploy(DeployTriggerOpts request) { return deploy(request, null); } - public PipedreamApiHttpResponse deploy( + public PipedreamApiClientHttpResponse deploy( DeployTriggerOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -272,7 +272,7 @@ public PipedreamApiHttpResponse deploy( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -290,16 +290,16 @@ public PipedreamApiHttpResponse deploy( if (response.isSuccessful()) { DeployTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), DeployTriggerResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/users/AsyncRawUsersClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/users/AsyncRawUsersClient.java index 5cb2cdb..ead6c91 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/users/AsyncRawUsersClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/users/AsyncRawUsersClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import java.io.IOException; import java.util.concurrent.CompletableFuture; @@ -28,11 +28,11 @@ public AsyncRawUsersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> deleteExternalUser(String externalUserId) { + public CompletableFuture> deleteExternalUser(String externalUserId) { return deleteExternalUser(externalUserId, null); } - public CompletableFuture> deleteExternalUser( + public CompletableFuture> deleteExternalUser( String externalUserId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -50,30 +50,32 @@ public CompletableFuture> deleteExternalUser( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>(null, response)); + future.complete(new PipedreamApiClientHttpResponse<>(null, response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/users/RawUsersClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/users/RawUsersClient.java index 7fe69c9..b8f58b0 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/users/RawUsersClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/users/RawUsersClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import java.io.IOException; import okhttp3.Headers; @@ -24,11 +24,12 @@ public RawUsersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse deleteExternalUser(String externalUserId) { + public PipedreamApiClientHttpResponse deleteExternalUser(String externalUserId) { return deleteExternalUser(externalUserId, null); } - public PipedreamApiHttpResponse deleteExternalUser(String externalUserId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse deleteExternalUser( + String externalUserId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -48,16 +49,16 @@ public PipedreamApiHttpResponse deleteExternalUser(String externalUserId, try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>(null, response); + return new PipedreamApiClientHttpResponse<>(null, response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/reference.md b/reference.md index d4f2874..4569eb0 100644 --- a/reference.md +++ b/reference.md @@ -318,6 +318,8 @@ client.accounts().create( CreateAccountRequest .builder() .appSlug("app_slug") + .cfmapJson("cfmap_json") + .connectToken("connect_token") .build() ); ``` @@ -374,7 +376,15 @@ client.accounts().create(
-**cfmapJson:** `Optional` — JSON string containing the custom fields mapping +**cfmapJson:** `String` — JSON string containing the custom fields mapping + +
+
+ +
+
+ +**connectToken:** `String` — The connect token for authentication
diff --git a/src/main/java/com/pipedream/api/AsyncPipedreamApiClientBuilder.java b/src/main/java/com/pipedream/api/AsyncPipedreamApiClientBuilder.java index 0ebee7b..f90180f 100644 --- a/src/main/java/com/pipedream/api/AsyncPipedreamApiClientBuilder.java +++ b/src/main/java/com/pipedream/api/AsyncPipedreamApiClientBuilder.java @@ -5,36 +5,23 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.Environment; -import com.pipedream.api.core.OAuthTokenSupplier; -import com.pipedream.api.resources.oauthtokens.OauthTokensClient; import okhttp3.OkHttpClient; public final class AsyncPipedreamApiClientBuilder { private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); - private String clientId = System.getenv("PIPEDREAM_CLIENT_ID"); - - private String clientSecret = System.getenv("PIPEDREAM_CLIENT_SECRET"); + private String accessToken = System.getenv("PIPEDREAM_ACCESS_TOKEN"); private String projectEnvironment = null; private Environment environment = Environment.PROD; /** - * Sets clientId. - * Defaults to the PIPEDREAM_CLIENT_ID environment variable. - */ - public AsyncPipedreamApiClientBuilder clientId(String clientId) { - this.clientId = clientId; - return this; - } - - /** - * Sets clientSecret. - * Defaults to the PIPEDREAM_CLIENT_SECRET environment variable. + * Sets accessToken. + * Defaults to the PIPEDREAM_ACCESS_TOKEN environment variable. */ - public AsyncPipedreamApiClientBuilder clientSecret(String clientSecret) { - this.clientSecret = clientSecret; + public AsyncPipedreamApiClientBuilder accessToken(String accessToken) { + this.accessToken = accessToken; return this; } @@ -86,10 +73,7 @@ public AsyncPipedreamApiClientBuilder projectId(String projectId) { } public AsyncPipedreamApiClient build() { - OauthTokensClient authClient = new OauthTokensClient( - ClientOptions.builder().environment(this.environment).build()); - OAuthTokenSupplier oAuthTokenSupplier = new OAuthTokenSupplier(clientId, clientSecret, authClient); - this.clientOptionsBuilder.addHeader("Authorization", oAuthTokenSupplier); + this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.accessToken); if (projectEnvironment != null) { this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment); } diff --git a/src/main/java/com/pipedream/api/PipedreamApiClientBuilder.java b/src/main/java/com/pipedream/api/PipedreamApiClientBuilder.java index 9983f98..048172a 100644 --- a/src/main/java/com/pipedream/api/PipedreamApiClientBuilder.java +++ b/src/main/java/com/pipedream/api/PipedreamApiClientBuilder.java @@ -5,36 +5,23 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.Environment; -import com.pipedream.api.core.OAuthTokenSupplier; -import com.pipedream.api.resources.oauthtokens.OauthTokensClient; import okhttp3.OkHttpClient; public final class PipedreamApiClientBuilder { private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); - private String clientId = System.getenv("PIPEDREAM_CLIENT_ID"); - - private String clientSecret = System.getenv("PIPEDREAM_CLIENT_SECRET"); + private String accessToken = System.getenv("PIPEDREAM_ACCESS_TOKEN"); private String projectEnvironment = null; private Environment environment = Environment.PROD; /** - * Sets clientId. - * Defaults to the PIPEDREAM_CLIENT_ID environment variable. - */ - public PipedreamApiClientBuilder clientId(String clientId) { - this.clientId = clientId; - return this; - } - - /** - * Sets clientSecret. - * Defaults to the PIPEDREAM_CLIENT_SECRET environment variable. + * Sets accessToken. + * Defaults to the PIPEDREAM_ACCESS_TOKEN environment variable. */ - public PipedreamApiClientBuilder clientSecret(String clientSecret) { - this.clientSecret = clientSecret; + public PipedreamApiClientBuilder accessToken(String accessToken) { + this.accessToken = accessToken; return this; } @@ -86,10 +73,7 @@ public PipedreamApiClientBuilder projectId(String projectId) { } public PipedreamApiClient build() { - OauthTokensClient authClient = new OauthTokensClient( - ClientOptions.builder().environment(this.environment).build()); - OAuthTokenSupplier oAuthTokenSupplier = new OAuthTokenSupplier(clientId, clientSecret, authClient); - this.clientOptionsBuilder.addHeader("Authorization", oAuthTokenSupplier); + this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.accessToken); if (projectEnvironment != null) { this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment); } diff --git a/src/main/java/com/pipedream/api/core/ClientOptions.java b/src/main/java/com/pipedream/api/core/ClientOptions.java index 5424c0d..738853c 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.202"); + put("X-Fern-SDK-Version", "0.0.216"); } }); this.headerSuppliers = headerSuppliers; diff --git a/src/main/java/com/pipedream/api/core/OAuthTokenSupplier.java b/src/main/java/com/pipedream/api/core/OAuthTokenSupplier.java deleted file mode 100644 index ddbde79..0000000 --- a/src/main/java/com/pipedream/api/core/OAuthTokenSupplier.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.core; - -import com.pipedream.api.resources.oauthtokens.OauthTokensClient; -import com.pipedream.api.resources.oauthtokens.requests.CreateOAuthTokenOpts; -import com.pipedream.api.types.CreateOAuthTokenResponse; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.function.Supplier; - -public final class OAuthTokenSupplier implements Supplier { - private static final long BUFFER_IN_MINUTES = 2; - - private final String clientId; - - private final String clientSecret; - - private final OauthTokensClient authClient; - - private String accessToken; - - private Instant expiresAt; - - public OAuthTokenSupplier(String clientId, String clientSecret, OauthTokensClient authClient) { - this.clientId = clientId; - this.clientSecret = clientSecret; - this.authClient = authClient; - this.expiresAt = Instant.now(); - } - - public CreateOAuthTokenResponse fetchToken() { - CreateOAuthTokenOpts getTokenRequest = CreateOAuthTokenOpts.builder() - .clientId(clientId) - .clientSecret(clientSecret) - .build(); - return authClient.create(getTokenRequest); - } - - @java.lang.Override - public String get() { - if (accessToken == null || expiresAt.isBefore(Instant.now())) { - CreateOAuthTokenResponse authResponse = fetchToken(); - this.accessToken = authResponse.getAccessToken(); - this.expiresAt = getExpiresAt(authResponse.getExpiresIn()); - } - return "Bearer " + accessToken; - } - - private Instant getExpiresAt(long expiresInSeconds) { - return Instant.now().plus(expiresInSeconds, ChronoUnit.SECONDS).minus(BUFFER_IN_MINUTES, ChronoUnit.MINUTES); - } -} diff --git a/src/main/java/com/pipedream/api/core/PipedreamApiApiException.java b/src/main/java/com/pipedream/api/core/PipedreamApiClientApiException.java similarity index 77% rename from src/main/java/com/pipedream/api/core/PipedreamApiApiException.java rename to src/main/java/com/pipedream/api/core/PipedreamApiClientApiException.java index d4d2e56..a593f29 100644 --- a/src/main/java/com/pipedream/api/core/PipedreamApiApiException.java +++ b/src/main/java/com/pipedream/api/core/PipedreamApiClientApiException.java @@ -12,7 +12,7 @@ /** * This exception type will be thrown for any non-2XX API responses. */ -public class PipedreamApiApiException extends PipedreamApiException { +public class PipedreamApiClientApiException extends PipedreamApiClientException { /** * The error code of the response that triggered the exception. */ @@ -25,14 +25,14 @@ public class PipedreamApiApiException extends PipedreamApiException { private final Map> headers; - public PipedreamApiApiException(String message, int statusCode, Object body) { + public PipedreamApiClientApiException(String message, int statusCode, Object body) { super(message); this.statusCode = statusCode; this.body = body; this.headers = new HashMap<>(); } - public PipedreamApiApiException(String message, int statusCode, Object body, Response rawResponse) { + public PipedreamApiClientApiException(String message, int statusCode, Object body, Response rawResponse) { super(message); this.statusCode = statusCode; this.body = body; @@ -67,7 +67,7 @@ public Map> headers() { @java.lang.Override public String toString() { - return "PipedreamApiApiException{" + "message: " + getMessage() + ", statusCode: " + statusCode + ", body: " - + body + "}"; + return "PipedreamApiClientApiException{" + "message: " + getMessage() + ", statusCode: " + statusCode + + ", body: " + body + "}"; } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiException.java b/src/main/java/com/pipedream/api/core/PipedreamApiClientException.java similarity index 56% rename from build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiException.java rename to src/main/java/com/pipedream/api/core/PipedreamApiClientException.java index 866b47e..c7d02bb 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiException.java +++ b/src/main/java/com/pipedream/api/core/PipedreamApiClientException.java @@ -6,12 +6,12 @@ /** * This class serves as the base exception for all errors in the SDK. */ -public class PipedreamApiException extends RuntimeException { - public PipedreamApiException(String message) { +public class PipedreamApiClientException extends RuntimeException { + public PipedreamApiClientException(String message) { super(message); } - public PipedreamApiException(String message, Exception e) { + public PipedreamApiClientException(String message, Exception e) { super(message, e); } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiHttpResponse.java b/src/main/java/com/pipedream/api/core/PipedreamApiClientHttpResponse.java similarity index 86% rename from build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiHttpResponse.java rename to src/main/java/com/pipedream/api/core/PipedreamApiClientHttpResponse.java index 59f2804..3744f56 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/core/PipedreamApiHttpResponse.java +++ b/src/main/java/com/pipedream/api/core/PipedreamApiClientHttpResponse.java @@ -9,13 +9,13 @@ import java.util.Map; import okhttp3.Response; -public final class PipedreamApiHttpResponse { +public final class PipedreamApiClientHttpResponse { private final T body; private final Map> headers; - public PipedreamApiHttpResponse(T body, Response rawResponse) { + public PipedreamApiClientHttpResponse(T body, Response rawResponse) { this.body = body; Map> headers = new HashMap<>(); diff --git a/src/main/java/com/pipedream/api/core/RequestOptions.java b/src/main/java/com/pipedream/api/core/RequestOptions.java index 559f48d..da2ac6a 100644 --- a/src/main/java/com/pipedream/api/core/RequestOptions.java +++ b/src/main/java/com/pipedream/api/core/RequestOptions.java @@ -10,6 +10,8 @@ import java.util.function.Supplier; public final class RequestOptions { + private final String accessToken; + private final String projectEnvironment; private final Optional timeout; @@ -21,11 +23,13 @@ public final class RequestOptions { private final Map> headerSuppliers; private RequestOptions( + String accessToken, String projectEnvironment, Optional timeout, TimeUnit timeoutTimeUnit, Map headers, Map> headerSuppliers) { + this.accessToken = accessToken; this.projectEnvironment = projectEnvironment; this.timeout = timeout; this.timeoutTimeUnit = timeoutTimeUnit; @@ -43,6 +47,9 @@ public TimeUnit getTimeoutTimeUnit() { public Map getHeaders() { Map headers = new HashMap<>(); + if (this.accessToken != null) { + headers.put("Authorization", "Bearer " + this.accessToken); + } if (this.projectEnvironment != null) { headers.put("x-pd-environment", this.projectEnvironment); } @@ -58,6 +65,8 @@ public static Builder builder() { } public static final class Builder { + private String accessToken = null; + private String projectEnvironment = null; private Optional timeout = Optional.empty(); @@ -68,6 +77,11 @@ public static final class Builder { private final Map> headerSuppliers = new HashMap<>(); + public Builder accessToken(String accessToken) { + this.accessToken = accessToken; + return this; + } + public Builder projectEnvironment(String projectEnvironment) { this.projectEnvironment = projectEnvironment; return this; @@ -95,7 +109,8 @@ public Builder addHeader(String key, Supplier value) { } public RequestOptions build() { - return new RequestOptions(projectEnvironment, timeout, timeoutTimeUnit, headers, headerSuppliers); + return new RequestOptions( + accessToken, projectEnvironment, timeout, timeoutTimeUnit, headers, headerSuppliers); } } } diff --git a/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java b/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java index 82dc947..3cf4d57 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java +++ b/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -42,15 +42,16 @@ public AsyncRawAccountsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(AccountsListRequest.builder().build()); } - public CompletableFuture>> list(AccountsListRequest request) { + public CompletableFuture>> list( + AccountsListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( AccountsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -98,7 +99,8 @@ public CompletableFuture>> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -113,7 +115,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -127,30 +129,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> create(CreateAccountRequest request) { + public CompletableFuture> create(CreateAccountRequest request) { return create(request, null); } - public CompletableFuture> create( + public CompletableFuture> create( CreateAccountRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -171,9 +175,8 @@ public CompletableFuture> create( } Map properties = new HashMap<>(); properties.put("app_slug", request.getAppSlug()); - if (request.getCfmapJson().isPresent()) { - properties.put("cfmap_json", request.getCfmapJson()); - } + properties.put("cfmap_json", request.getCfmapJson()); + properties.put("connect_token", request.getConnectToken()); if (request.getName().isPresent()) { properties.put("name", request.getName()); } @@ -195,46 +198,48 @@ public CompletableFuture> create( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Account.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String accountId) { + public CompletableFuture> retrieve(String accountId) { return retrieve(accountId, AccountsRetrieveRequest.builder().build()); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String accountId, AccountsRetrieveRequest request) { return retrieve(accountId, request, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String accountId, AccountsRetrieveRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -259,41 +264,44 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Account.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> delete(String accountId) { + public CompletableFuture> delete(String accountId) { return delete(accountId, null); } - public CompletableFuture> delete(String accountId, RequestOptions requestOptions) { + public CompletableFuture> delete( + String accountId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -310,40 +318,43 @@ public CompletableFuture> delete(String accountId if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>(null, response)); + future.complete(new PipedreamApiClientHttpResponse<>(null, response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> deleteByApp(String appId) { + public CompletableFuture> deleteByApp(String appId) { return deleteByApp(appId, null); } - public CompletableFuture> deleteByApp(String appId, RequestOptions requestOptions) { + public CompletableFuture> deleteByApp( + String appId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -361,30 +372,32 @@ public CompletableFuture> deleteByApp(String appI if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>(null, response)); + future.complete(new PipedreamApiClientHttpResponse<>(null, response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java b/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java index ad4652d..7aef857 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java +++ b/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -37,15 +37,15 @@ public RawAccountsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(AccountsListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(AccountsListRequest request) { + public PipedreamApiClientHttpResponse> list(AccountsListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( AccountsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -104,28 +104,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse create(CreateAccountRequest request) { + public PipedreamApiClientHttpResponse create(CreateAccountRequest request) { return create(request, null); } - public PipedreamApiHttpResponse create(CreateAccountRequest request, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse create(CreateAccountRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -145,9 +145,8 @@ public PipedreamApiHttpResponse create(CreateAccountRequest request, Re } Map properties = new HashMap<>(); properties.put("app_slug", request.getAppSlug()); - if (request.getCfmapJson().isPresent()) { - properties.put("cfmap_json", request.getCfmapJson()); - } + properties.put("cfmap_json", request.getCfmapJson()); + properties.put("connect_token", request.getConnectToken()); if (request.getName().isPresent()) { properties.put("name", request.getName()); } @@ -172,29 +171,29 @@ public PipedreamApiHttpResponse create(CreateAccountRequest request, Re try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Account.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String accountId) { + public PipedreamApiClientHttpResponse retrieve(String accountId) { return retrieve(accountId, AccountsRetrieveRequest.builder().build()); } - public PipedreamApiHttpResponse retrieve(String accountId, AccountsRetrieveRequest request) { + public PipedreamApiClientHttpResponse retrieve(String accountId, AccountsRetrieveRequest request) { return retrieve(accountId, request, null); } - public PipedreamApiHttpResponse retrieve( + public PipedreamApiClientHttpResponse retrieve( String accountId, AccountsRetrieveRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -222,25 +221,25 @@ public PipedreamApiHttpResponse retrieve( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Account.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse delete(String accountId) { + public PipedreamApiClientHttpResponse delete(String accountId) { return delete(accountId, null); } - public PipedreamApiHttpResponse delete(String accountId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse delete(String accountId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -260,24 +259,24 @@ public PipedreamApiHttpResponse delete(String accountId, RequestOptions re try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>(null, response); + return new PipedreamApiClientHttpResponse<>(null, response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse deleteByApp(String appId) { + public PipedreamApiClientHttpResponse deleteByApp(String appId) { return deleteByApp(appId, null); } - public PipedreamApiHttpResponse deleteByApp(String appId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse deleteByApp(String appId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -298,16 +297,16 @@ public PipedreamApiHttpResponse deleteByApp(String appId, RequestOptions r try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>(null, response); + return new PipedreamApiClientHttpResponse<>(null, response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java b/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java index fe25bb8..aeec52a 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java +++ b/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java @@ -29,7 +29,9 @@ public final class CreateAccountRequest { private final String appSlug; - private final Optional cfmapJson; + private final String cfmapJson; + + private final String connectToken; private final Optional name; @@ -40,7 +42,8 @@ private CreateAccountRequest( Optional externalUserId, Optional oauthAppId, String appSlug, - Optional cfmapJson, + String cfmapJson, + String connectToken, Optional name, Map additionalProperties) { this.appId = appId; @@ -48,6 +51,7 @@ private CreateAccountRequest( this.oauthAppId = oauthAppId; this.appSlug = appSlug; this.cfmapJson = cfmapJson; + this.connectToken = connectToken; this.name = name; this.additionalProperties = additionalProperties; } @@ -85,10 +89,18 @@ public String getAppSlug() { * @return JSON string containing the custom fields mapping */ @JsonProperty("cfmap_json") - public Optional getCfmapJson() { + public String getCfmapJson() { return cfmapJson; } + /** + * @return The connect token for authentication + */ + @JsonProperty("connect_token") + public String getConnectToken() { + return connectToken; + } + /** * @return Optional name for the account */ @@ -114,12 +126,20 @@ private boolean equalTo(CreateAccountRequest other) { && oauthAppId.equals(other.oauthAppId) && appSlug.equals(other.appSlug) && cfmapJson.equals(other.cfmapJson) + && connectToken.equals(other.connectToken) && name.equals(other.name); } @java.lang.Override public int hashCode() { - return Objects.hash(this.appId, this.externalUserId, this.oauthAppId, this.appSlug, this.cfmapJson, this.name); + return Objects.hash( + this.appId, + this.externalUserId, + this.oauthAppId, + this.appSlug, + this.cfmapJson, + this.connectToken, + this.name); } @java.lang.Override @@ -135,11 +155,25 @@ public interface AppSlugStage { /** *

The app slug for the account

*/ - _FinalStage appSlug(@NotNull String appSlug); + CfmapJsonStage appSlug(@NotNull String appSlug); Builder from(CreateAccountRequest other); } + public interface CfmapJsonStage { + /** + *

JSON string containing the custom fields mapping

+ */ + ConnectTokenStage cfmapJson(@NotNull String cfmapJson); + } + + public interface ConnectTokenStage { + /** + *

The connect token for authentication

+ */ + _FinalStage connectToken(@NotNull String connectToken); + } + public interface _FinalStage { CreateAccountRequest build(); @@ -161,13 +195,6 @@ public interface _FinalStage { _FinalStage oauthAppId(String oauthAppId); - /** - *

JSON string containing the custom fields mapping

- */ - _FinalStage cfmapJson(Optional cfmapJson); - - _FinalStage cfmapJson(String cfmapJson); - /** *

Optional name for the account

*/ @@ -177,12 +204,14 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements AppSlugStage, _FinalStage { + public static final class Builder implements AppSlugStage, CfmapJsonStage, ConnectTokenStage, _FinalStage { private String appSlug; - private Optional name = Optional.empty(); + private String cfmapJson; - private Optional cfmapJson = Optional.empty(); + private String connectToken; + + private Optional name = Optional.empty(); private Optional oauthAppId = Optional.empty(); @@ -202,6 +231,7 @@ public Builder from(CreateAccountRequest other) { oauthAppId(other.getOauthAppId()); appSlug(other.getAppSlug()); cfmapJson(other.getCfmapJson()); + connectToken(other.getConnectToken()); name(other.getName()); return this; } @@ -213,48 +243,52 @@ public Builder from(CreateAccountRequest other) { */ @java.lang.Override @JsonSetter("app_slug") - public _FinalStage appSlug(@NotNull String appSlug) { + public CfmapJsonStage appSlug(@NotNull String appSlug) { this.appSlug = Objects.requireNonNull(appSlug, "appSlug must not be null"); return this; } /** - *

Optional name for the account

+ *

JSON string containing the custom fields mapping

+ *

JSON string containing the custom fields mapping

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - public _FinalStage name(String name) { - this.name = Optional.ofNullable(name); + @JsonSetter("cfmap_json") + public ConnectTokenStage cfmapJson(@NotNull String cfmapJson) { + this.cfmapJson = Objects.requireNonNull(cfmapJson, "cfmapJson must not be null"); return this; } /** - *

Optional name for the account

+ *

The connect token for authentication

+ *

The connect token for authentication

+ * @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter(value = "name", nulls = Nulls.SKIP) - public _FinalStage name(Optional name) { - this.name = name; + @JsonSetter("connect_token") + public _FinalStage connectToken(@NotNull String connectToken) { + this.connectToken = Objects.requireNonNull(connectToken, "connectToken must not be null"); return this; } /** - *

JSON string containing the custom fields mapping

+ *

Optional name for the account

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - public _FinalStage cfmapJson(String cfmapJson) { - this.cfmapJson = Optional.ofNullable(cfmapJson); + public _FinalStage name(String name) { + this.name = Optional.ofNullable(name); return this; } /** - *

JSON string containing the custom fields mapping

+ *

Optional name for the account

*/ @java.lang.Override - @JsonSetter(value = "cfmap_json", nulls = Nulls.SKIP) - public _FinalStage cfmapJson(Optional cfmapJson) { - this.cfmapJson = cfmapJson; + @JsonSetter(value = "name", nulls = Nulls.SKIP) + public _FinalStage name(Optional name) { + this.name = name; return this; } @@ -314,7 +348,7 @@ public _FinalStage appId(Optional appId) { @java.lang.Override public CreateAccountRequest build() { return new CreateAccountRequest( - appId, externalUserId, oauthAppId, appSlug, cfmapJson, name, additionalProperties); + appId, externalUserId, oauthAppId, appSlug, cfmapJson, connectToken, name, additionalProperties); } } } diff --git a/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java b/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java index 9686990..b260c12 100644 --- a/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java +++ b/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -47,15 +47,16 @@ public AsyncRawActionsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(ActionsListRequest.builder().build()); } - public CompletableFuture>> list(ActionsListRequest request) { + public CompletableFuture>> list( + ActionsListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( ActionsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -90,7 +91,8 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -105,7 +107,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -119,30 +121,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String componentId) { + public CompletableFuture> retrieve(String componentId) { return retrieve(componentId, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -161,7 +165,7 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -169,35 +173,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( ActionsConfigurePropRequest request) { return configureProp(request, null); } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( ActionsConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -226,43 +232,45 @@ public CompletableFuture> config if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( ActionsReloadPropsRequest request) { return reloadProps(request, null); } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( ActionsReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -291,42 +299,44 @@ public CompletableFuture> reloadPr if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> run(RunActionOpts request) { + public CompletableFuture> run(RunActionOpts request) { return run(request, null); } - public CompletableFuture> run( + public CompletableFuture> run( RunActionOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -364,32 +374,34 @@ public CompletableFuture> run( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), RunActionResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java b/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java index eee1aa6..4739375 100644 --- a/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java +++ b/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -42,15 +42,15 @@ public RawActionsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(ActionsListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(ActionsListRequest request) { + public PipedreamApiClientHttpResponse> list(ActionsListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( ActionsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -96,28 +96,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String componentId) { + public PipedreamApiClientHttpResponse retrieve(String componentId) { return retrieve(componentId, null); } - public PipedreamApiHttpResponse retrieve(String componentId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -140,24 +140,24 @@ public PipedreamApiHttpResponse retrieve(String componentId, RequestO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse configureProp(ActionsConfigurePropRequest request) { + public PipedreamApiClientHttpResponse configureProp(ActionsConfigurePropRequest request) { return configureProp(request, null); } - public PipedreamApiHttpResponse configureProp( + public PipedreamApiClientHttpResponse configureProp( ActionsConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -189,26 +189,26 @@ public PipedreamApiHttpResponse configureProp( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse reloadProps(ActionsReloadPropsRequest request) { + public PipedreamApiClientHttpResponse reloadProps(ActionsReloadPropsRequest request) { return reloadProps(request, null); } - public PipedreamApiHttpResponse reloadProps( + public PipedreamApiClientHttpResponse reloadProps( ActionsReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -240,26 +240,26 @@ public PipedreamApiHttpResponse reloadProps( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse run(RunActionOpts request) { + public PipedreamApiClientHttpResponse run(RunActionOpts request) { return run(request, null); } - public PipedreamApiHttpResponse run(RunActionOpts request, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse run(RunActionOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -299,17 +299,17 @@ public PipedreamApiHttpResponse run(RunActionOpts request, Re try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), RunActionResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/appcategories/AsyncRawAppCategoriesClient.java b/src/main/java/com/pipedream/api/resources/appcategories/AsyncRawAppCategoriesClient.java index c7a7bf5..3bdfe9c 100644 --- a/src/main/java/com/pipedream/api/resources/appcategories/AsyncRawAppCategoriesClient.java +++ b/src/main/java/com/pipedream/api/resources/appcategories/AsyncRawAppCategoriesClient.java @@ -6,9 +6,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.types.AppCategory; import java.io.IOException; @@ -31,11 +31,11 @@ public AsyncRawAppCategoriesClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(null); } - public CompletableFuture>> list(RequestOptions requestOptions) { + public CompletableFuture>> list(RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/app_categories") @@ -50,43 +50,46 @@ public CompletableFuture>> list(Reque if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String id) { + public CompletableFuture> retrieve(String id) { return retrieve(id, null); } - public CompletableFuture> retrieve(String id, RequestOptions requestOptions) { + public CompletableFuture> retrieve( + String id, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/app_categories") @@ -102,32 +105,34 @@ public CompletableFuture> retrieve(String if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), AppCategory.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/appcategories/RawAppCategoriesClient.java b/src/main/java/com/pipedream/api/resources/appcategories/RawAppCategoriesClient.java index 497bd77..46fa62f 100644 --- a/src/main/java/com/pipedream/api/resources/appcategories/RawAppCategoriesClient.java +++ b/src/main/java/com/pipedream/api/resources/appcategories/RawAppCategoriesClient.java @@ -6,9 +6,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.types.AppCategory; import java.io.IOException; @@ -27,11 +27,11 @@ public RawAppCategoriesClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(null); } - public PipedreamApiHttpResponse> list(RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse> list(RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/app_categories") @@ -49,27 +49,27 @@ public PipedreamApiHttpResponse> list(RequestOptions requestOp try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String id) { + public PipedreamApiClientHttpResponse retrieve(String id) { return retrieve(id, null); } - public PipedreamApiHttpResponse retrieve(String id, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String id, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/app_categories") @@ -88,17 +88,17 @@ public PipedreamApiHttpResponse retrieve(String id, RequestOptions try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), AppCategory.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/apps/AsyncRawAppsClient.java b/src/main/java/com/pipedream/api/resources/apps/AsyncRawAppsClient.java index 42967c0..9146023 100644 --- a/src/main/java/com/pipedream/api/resources/apps/AsyncRawAppsClient.java +++ b/src/main/java/com/pipedream/api/resources/apps/AsyncRawAppsClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -37,15 +37,15 @@ public AsyncRawAppsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(AppsListRequest.builder().build()); } - public CompletableFuture>> list(AppsListRequest request) { + public CompletableFuture>> list(AppsListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( AppsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -87,7 +87,7 @@ public CompletableFuture>> list if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -102,7 +102,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -116,30 +116,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String appId) { + public CompletableFuture> retrieve(String appId) { return retrieve(appId, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String appId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -156,32 +158,34 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetAppResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/apps/RawAppsClient.java b/src/main/java/com/pipedream/api/resources/apps/RawAppsClient.java index 37619d9..a65d416 100644 --- a/src/main/java/com/pipedream/api/resources/apps/RawAppsClient.java +++ b/src/main/java/com/pipedream/api/resources/apps/RawAppsClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -32,15 +32,15 @@ public RawAppsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(AppsListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(AppsListRequest request) { + public PipedreamApiClientHttpResponse> list(AppsListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( AppsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -93,28 +93,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String appId) { + public PipedreamApiClientHttpResponse retrieve(String appId) { return retrieve(appId, null); } - public PipedreamApiHttpResponse retrieve(String appId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String appId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect/apps") @@ -133,17 +133,17 @@ public PipedreamApiHttpResponse retrieve(String appId, RequestOp try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetAppResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java b/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java index 43e8178..677e973 100644 --- a/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java +++ b/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -43,16 +43,16 @@ public AsyncRawComponentsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(ComponentsListRequest.builder().build()); } - public CompletableFuture>> list( + public CompletableFuture>> list( ComponentsListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( ComponentsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -87,7 +87,8 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -102,7 +103,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -116,30 +117,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String componentId) { + public CompletableFuture> retrieve(String componentId) { return retrieve(componentId, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -158,7 +161,7 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -166,35 +169,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( ComponentsConfigurePropRequest request) { return configureProp(request, null); } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( ComponentsConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -223,43 +228,45 @@ public CompletableFuture> config if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( ComponentsReloadPropsRequest request) { return reloadProps(request, null); } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( ComponentsReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -288,32 +295,34 @@ public CompletableFuture> reloadPr if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java b/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java index cd8521d..a02f145 100644 --- a/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java +++ b/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -38,15 +38,15 @@ public RawComponentsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(ComponentsListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(ComponentsListRequest request) { + public PipedreamApiClientHttpResponse> list(ComponentsListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( ComponentsListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -92,28 +92,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String componentId) { + public PipedreamApiClientHttpResponse retrieve(String componentId) { return retrieve(componentId, null); } - public PipedreamApiHttpResponse retrieve(String componentId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -136,24 +136,24 @@ public PipedreamApiHttpResponse retrieve(String componentId, RequestO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse configureProp(ComponentsConfigurePropRequest request) { + public PipedreamApiClientHttpResponse configureProp(ComponentsConfigurePropRequest request) { return configureProp(request, null); } - public PipedreamApiHttpResponse configureProp( + public PipedreamApiClientHttpResponse configureProp( ComponentsConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -185,26 +185,26 @@ public PipedreamApiHttpResponse configureProp( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse reloadProps(ComponentsReloadPropsRequest request) { + public PipedreamApiClientHttpResponse reloadProps(ComponentsReloadPropsRequest request) { return reloadProps(request, null); } - public PipedreamApiHttpResponse reloadProps( + public PipedreamApiClientHttpResponse reloadProps( ComponentsReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -236,18 +236,18 @@ public PipedreamApiHttpResponse reloadProps( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/deployedtriggers/AsyncRawDeployedTriggersClient.java b/src/main/java/com/pipedream/api/resources/deployedtriggers/AsyncRawDeployedTriggersClient.java index cbee597..ee7fe6b 100644 --- a/src/main/java/com/pipedream/api/resources/deployedtriggers/AsyncRawDeployedTriggersClient.java +++ b/src/main/java/com/pipedream/api/resources/deployedtriggers/AsyncRawDeployedTriggersClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -53,12 +53,12 @@ public AsyncRawDeployedTriggersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list( + public CompletableFuture>> list( DeployedTriggersListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( DeployedTriggersListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -88,7 +88,7 @@ public CompletableFuture>> future = + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override @@ -104,7 +104,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -118,31 +118,33 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String triggerId, DeployedTriggersRetrieveRequest request) { return retrieve(triggerId, request, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String triggerId, DeployedTriggersRetrieveRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -161,7 +163,7 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -169,35 +171,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> update( + public CompletableFuture> update( String triggerId, UpdateTriggerOpts request) { return update(triggerId, request, null); } - public CompletableFuture> update( + public CompletableFuture> update( String triggerId, UpdateTriggerOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -234,7 +238,7 @@ public CompletableFuture> update( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -242,35 +246,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> delete( + public CompletableFuture> delete( String triggerId, DeployedTriggersDeleteRequest request) { return delete(triggerId, request, null); } - public CompletableFuture> delete( + public CompletableFuture> delete( String triggerId, DeployedTriggersDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -292,41 +298,43 @@ public CompletableFuture> delete( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>(null, response)); + future.complete(new PipedreamApiClientHttpResponse<>(null, response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> listEvents( + public CompletableFuture>> listEvents( String triggerId, DeployedTriggersListEventsRequest request) { return listEvents(triggerId, request, null); } - public CompletableFuture>> listEvents( + public CompletableFuture>> listEvents( String triggerId, DeployedTriggersListEventsRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -349,7 +357,7 @@ public CompletableFuture>> listEvent if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -357,35 +365,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetTriggerEventsResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerEventsResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> listWorkflows( + public CompletableFuture> listWorkflows( String triggerId, DeployedTriggersListWorkflowsRequest request) { return listWorkflows(triggerId, request, null); } - public CompletableFuture> listWorkflows( + public CompletableFuture> listWorkflows( String triggerId, DeployedTriggersListWorkflowsRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -405,44 +415,47 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerWorkflowsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> updateWorkflows( + public CompletableFuture> updateWorkflows( String triggerId, UpdateTriggerWorkflowsOpts request) { return updateWorkflows(triggerId, request, null); } - public CompletableFuture> updateWorkflows( + public CompletableFuture> updateWorkflows( String triggerId, UpdateTriggerWorkflowsOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -472,44 +485,47 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerWorkflowsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> listWebhooks( + public CompletableFuture> listWebhooks( String triggerId, DeployedTriggersListWebhooksRequest request) { return listWebhooks(triggerId, request, null); } - public CompletableFuture> listWebhooks( + public CompletableFuture> listWebhooks( String triggerId, DeployedTriggersListWebhooksRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -529,44 +545,47 @@ public CompletableFuture> l if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerWebhooksResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> updateWebhooks( + public CompletableFuture> updateWebhooks( String triggerId, UpdateTriggerWebhooksOpts request) { return updateWebhooks(triggerId, request, null); } - public CompletableFuture> updateWebhooks( + public CompletableFuture> updateWebhooks( String triggerId, UpdateTriggerWebhooksOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -596,33 +615,36 @@ public CompletableFuture> u if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), GetTriggerWebhooksResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/deployedtriggers/RawDeployedTriggersClient.java b/src/main/java/com/pipedream/api/resources/deployedtriggers/RawDeployedTriggersClient.java index 0e1e09f..6089582 100644 --- a/src/main/java/com/pipedream/api/resources/deployedtriggers/RawDeployedTriggersClient.java +++ b/src/main/java/com/pipedream/api/resources/deployedtriggers/RawDeployedTriggersClient.java @@ -6,9 +6,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -48,11 +48,12 @@ public RawDeployedTriggersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list(DeployedTriggersListRequest request) { + public PipedreamApiClientHttpResponse> list( + DeployedTriggersListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( DeployedTriggersListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -93,29 +94,29 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve( + public PipedreamApiClientHttpResponse retrieve( String triggerId, DeployedTriggersRetrieveRequest request) { return retrieve(triggerId, request, null); } - public PipedreamApiHttpResponse retrieve( + public PipedreamApiClientHttpResponse retrieve( String triggerId, DeployedTriggersRetrieveRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -139,24 +140,24 @@ public PipedreamApiHttpResponse retrieve( if (response.isSuccessful()) { GetTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse update(String triggerId, UpdateTriggerOpts request) { + public PipedreamApiClientHttpResponse update(String triggerId, UpdateTriggerOpts request) { return update(triggerId, request, null); } - public PipedreamApiHttpResponse update( + public PipedreamApiClientHttpResponse update( String triggerId, UpdateTriggerOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -198,24 +199,24 @@ public PipedreamApiHttpResponse update( if (response.isSuccessful()) { GetTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse delete(String triggerId, DeployedTriggersDeleteRequest request) { + public PipedreamApiClientHttpResponse delete(String triggerId, DeployedTriggersDeleteRequest request) { return delete(triggerId, request, null); } - public PipedreamApiHttpResponse delete( + public PipedreamApiClientHttpResponse delete( String triggerId, DeployedTriggersDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -240,25 +241,25 @@ public PipedreamApiHttpResponse delete( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>(null, response); + return new PipedreamApiClientHttpResponse<>(null, response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> listEvents( + public PipedreamApiClientHttpResponse> listEvents( String triggerId, DeployedTriggersListEventsRequest request) { return listEvents(triggerId, request, null); } - public PipedreamApiHttpResponse> listEvents( + public PipedreamApiClientHttpResponse> listEvents( String triggerId, DeployedTriggersListEventsRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -286,25 +287,25 @@ public PipedreamApiHttpResponse> listEvents( if (response.isSuccessful()) { GetTriggerEventsResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerEventsResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse listWorkflows( + public PipedreamApiClientHttpResponse listWorkflows( String triggerId, DeployedTriggersListWorkflowsRequest request) { return listWorkflows(triggerId, request, null); } - public PipedreamApiHttpResponse listWorkflows( + public PipedreamApiClientHttpResponse listWorkflows( String triggerId, DeployedTriggersListWorkflowsRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -327,27 +328,27 @@ public PipedreamApiHttpResponse listWorkflows( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerWorkflowsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse updateWorkflows( + public PipedreamApiClientHttpResponse updateWorkflows( String triggerId, UpdateTriggerWorkflowsOpts request) { return updateWorkflows(triggerId, request, null); } - public PipedreamApiHttpResponse updateWorkflows( + public PipedreamApiClientHttpResponse updateWorkflows( String triggerId, UpdateTriggerWorkflowsOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -380,27 +381,27 @@ public PipedreamApiHttpResponse updateWorkflows( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerWorkflowsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse listWebhooks( + public PipedreamApiClientHttpResponse listWebhooks( String triggerId, DeployedTriggersListWebhooksRequest request) { return listWebhooks(triggerId, request, null); } - public PipedreamApiHttpResponse listWebhooks( + public PipedreamApiClientHttpResponse listWebhooks( String triggerId, DeployedTriggersListWebhooksRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -423,27 +424,27 @@ public PipedreamApiHttpResponse listWebhooks( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerWebhooksResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse updateWebhooks( + public PipedreamApiClientHttpResponse updateWebhooks( String triggerId, UpdateTriggerWebhooksOpts request) { return updateWebhooks(triggerId, request, null); } - public PipedreamApiHttpResponse updateWebhooks( + public PipedreamApiClientHttpResponse updateWebhooks( String triggerId, UpdateTriggerWebhooksOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -476,18 +477,18 @@ public PipedreamApiHttpResponse updateWebhooks( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetTriggerWebhooksResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/oauthtokens/AsyncRawOauthTokensClient.java b/src/main/java/com/pipedream/api/resources/oauthtokens/AsyncRawOauthTokensClient.java index cc29bb8..06c6f28 100644 --- a/src/main/java/com/pipedream/api/resources/oauthtokens/AsyncRawOauthTokensClient.java +++ b/src/main/java/com/pipedream/api/resources/oauthtokens/AsyncRawOauthTokensClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.oauthtokens.requests.CreateOAuthTokenOpts; import com.pipedream.api.types.CreateOAuthTokenResponse; @@ -33,11 +33,12 @@ public AsyncRawOauthTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> create(CreateOAuthTokenOpts request) { + public CompletableFuture> create( + CreateOAuthTokenOpts request) { return create(request, null); } - public CompletableFuture> create( + public CompletableFuture> create( CreateOAuthTokenOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -48,7 +49,7 @@ public CompletableFuture> cre body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -61,33 +62,35 @@ public CompletableFuture> cre if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), CreateOAuthTokenResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/oauthtokens/RawOauthTokensClient.java b/src/main/java/com/pipedream/api/resources/oauthtokens/RawOauthTokensClient.java index c7096b4..c6299e2 100644 --- a/src/main/java/com/pipedream/api/resources/oauthtokens/RawOauthTokensClient.java +++ b/src/main/java/com/pipedream/api/resources/oauthtokens/RawOauthTokensClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.oauthtokens.requests.CreateOAuthTokenOpts; import com.pipedream.api.types.CreateOAuthTokenResponse; @@ -29,11 +29,11 @@ public RawOauthTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse create(CreateOAuthTokenOpts request) { + public PipedreamApiClientHttpResponse create(CreateOAuthTokenOpts request) { return create(request, null); } - public PipedreamApiHttpResponse create( + public PipedreamApiClientHttpResponse create( CreateOAuthTokenOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -44,7 +44,7 @@ public PipedreamApiHttpResponse create( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -60,18 +60,18 @@ public PipedreamApiHttpResponse create( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CreateOAuthTokenResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/projects/AsyncRawProjectsClient.java b/src/main/java/com/pipedream/api/resources/projects/AsyncRawProjectsClient.java index df37ce8..c322367 100644 --- a/src/main/java/com/pipedream/api/resources/projects/AsyncRawProjectsClient.java +++ b/src/main/java/com/pipedream/api/resources/projects/AsyncRawProjectsClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.types.ProjectInfoResponse; import java.io.IOException; @@ -29,11 +29,11 @@ public AsyncRawProjectsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> retrieveInfo() { + public CompletableFuture> retrieveInfo() { return retrieveInfo(null); } - public CompletableFuture> retrieveInfo( + public CompletableFuture> retrieveInfo( RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -51,32 +51,34 @@ public CompletableFuture> retrieve if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ProjectInfoResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/projects/RawProjectsClient.java b/src/main/java/com/pipedream/api/resources/projects/RawProjectsClient.java index d09dc32..3f81535 100644 --- a/src/main/java/com/pipedream/api/resources/projects/RawProjectsClient.java +++ b/src/main/java/com/pipedream/api/resources/projects/RawProjectsClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.types.ProjectInfoResponse; import java.io.IOException; @@ -25,11 +25,11 @@ public RawProjectsClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse retrieveInfo() { + public PipedreamApiClientHttpResponse retrieveInfo() { return retrieveInfo(null); } - public PipedreamApiHttpResponse retrieveInfo(RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieveInfo(RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -49,18 +49,18 @@ public PipedreamApiHttpResponse retrieveInfo(RequestOptions try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ProjectInfoResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java b/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java index d6737d6..442e357 100644 --- a/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java +++ b/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.proxy.requests.ProxyDeleteRequest; @@ -38,11 +38,12 @@ public AsyncRawProxyClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> get(String url64, ProxyGetRequest request) { + public CompletableFuture>> get( + String url64, ProxyGetRequest request) { return get(url64, request, null); } - public CompletableFuture>> get( + public CompletableFuture>> get( String url64, ProxyGetRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -62,44 +63,46 @@ public CompletableFuture>> get( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> post( + public CompletableFuture>> post( String url64, ProxyPostRequest request) { return post(url64, request, null); } - public CompletableFuture>> post( + public CompletableFuture>> post( String url64, ProxyPostRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -127,43 +130,46 @@ public CompletableFuture>> post( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> put(String url64, ProxyPutRequest request) { + public CompletableFuture>> put( + String url64, ProxyPutRequest request) { return put(url64, request, null); } - public CompletableFuture>> put( + public CompletableFuture>> put( String url64, ProxyPutRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -191,44 +197,46 @@ public CompletableFuture>> put( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> delete( + public CompletableFuture>> delete( String url64, ProxyDeleteRequest request) { return delete(url64, request, null); } - public CompletableFuture>> delete( + public CompletableFuture>> delete( String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -248,44 +256,46 @@ public CompletableFuture>> delete( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture>> patch( + public CompletableFuture>> patch( String url64, ProxyPatchRequest request) { return patch(url64, request, null); } - public CompletableFuture>> patch( + public CompletableFuture>> patch( String url64, ProxyPatchRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -313,33 +323,35 @@ public CompletableFuture>> patch( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java b/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java index 9720f2b..122e2a8 100644 --- a/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java +++ b/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.proxy.requests.ProxyDeleteRequest; @@ -34,11 +34,11 @@ public RawProxyClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> get(String url64, ProxyGetRequest request) { + public PipedreamApiClientHttpResponse> get(String url64, ProxyGetRequest request) { return get(url64, request, null); } - public PipedreamApiHttpResponse> get( + public PipedreamApiClientHttpResponse> get( String url64, ProxyGetRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -61,27 +61,27 @@ public PipedreamApiHttpResponse> get( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> post(String url64, ProxyPostRequest request) { + public PipedreamApiClientHttpResponse> post(String url64, ProxyPostRequest request) { return post(url64, request, null); } - public PipedreamApiHttpResponse> post( + public PipedreamApiClientHttpResponse> post( String url64, ProxyPostRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -112,27 +112,27 @@ public PipedreamApiHttpResponse> post( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> put(String url64, ProxyPutRequest request) { + public PipedreamApiClientHttpResponse> put(String url64, ProxyPutRequest request) { return put(url64, request, null); } - public PipedreamApiHttpResponse> put( + public PipedreamApiClientHttpResponse> put( String url64, ProxyPutRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -163,27 +163,27 @@ public PipedreamApiHttpResponse> put( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> delete(String url64, ProxyDeleteRequest request) { + public PipedreamApiClientHttpResponse> delete(String url64, ProxyDeleteRequest request) { return delete(url64, request, null); } - public PipedreamApiHttpResponse> delete( + public PipedreamApiClientHttpResponse> delete( String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -206,27 +206,27 @@ public PipedreamApiHttpResponse> delete( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse> patch(String url64, ProxyPatchRequest request) { + public PipedreamApiClientHttpResponse> patch(String url64, ProxyPatchRequest request) { return patch(url64, request, null); } - public PipedreamApiHttpResponse> patch( + public PipedreamApiClientHttpResponse> patch( String url64, ProxyPatchRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -257,19 +257,19 @@ public PipedreamApiHttpResponse> patch( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue( responseBody.string(), new TypeReference>() {}), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java b/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java index 9ddd525..ff1385f 100644 --- a/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java +++ b/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; @@ -36,11 +36,11 @@ public AsyncRawTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> create(CreateTokenRequest request) { + public CompletableFuture> create(CreateTokenRequest request) { return create(request, null); } - public CompletableFuture> create( + public CompletableFuture> create( CreateTokenRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -51,7 +51,7 @@ public CompletableFuture> create( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -64,47 +64,49 @@ public CompletableFuture> create( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CreateTokenResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> validate(String ctok) { + public CompletableFuture> validate(String ctok) { return validate(ctok, TokensValidateRequest.builder().build()); } - public CompletableFuture> validate( + public CompletableFuture> validate( String ctok, TokensValidateRequest request) { return validate(ctok, request, null); } - public CompletableFuture> validate( + public CompletableFuture> validate( String ctok, TokensValidateRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -125,32 +127,34 @@ public CompletableFuture> valida if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ValidateTokenResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java b/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java index d20fbea..7e5ef32 100644 --- a/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java +++ b/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; @@ -32,11 +32,11 @@ public RawTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse create(CreateTokenRequest request) { + public PipedreamApiClientHttpResponse create(CreateTokenRequest request) { return create(request, null); } - public PipedreamApiHttpResponse create( + public PipedreamApiClientHttpResponse create( CreateTokenRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -47,7 +47,7 @@ public PipedreamApiHttpResponse create( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -63,30 +63,30 @@ public PipedreamApiHttpResponse create( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), CreateTokenResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse validate(String ctok) { + public PipedreamApiClientHttpResponse validate(String ctok) { return validate(ctok, TokensValidateRequest.builder().build()); } - public PipedreamApiHttpResponse validate(String ctok, TokensValidateRequest request) { + public PipedreamApiClientHttpResponse validate(String ctok, TokensValidateRequest request) { return validate(ctok, request, null); } - public PipedreamApiHttpResponse validate( + public PipedreamApiClientHttpResponse validate( String ctok, TokensValidateRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -110,18 +110,18 @@ public PipedreamApiHttpResponse validate( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ValidateTokenResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/triggers/AsyncRawTriggersClient.java b/src/main/java/com/pipedream/api/resources/triggers/AsyncRawTriggersClient.java index 8e4c08a..7574841 100644 --- a/src/main/java/com/pipedream/api/resources/triggers/AsyncRawTriggersClient.java +++ b/src/main/java/com/pipedream/api/resources/triggers/AsyncRawTriggersClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -47,16 +47,16 @@ public AsyncRawTriggersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture>> list() { + public CompletableFuture>> list() { return list(TriggersListRequest.builder().build()); } - public CompletableFuture>> list( + public CompletableFuture>> list( TriggersListRequest request) { return list(request, null); } - public CompletableFuture>> list( + public CompletableFuture>> list( TriggersListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -91,7 +91,8 @@ public CompletableFuture> if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture>> future = new CompletableFuture<>(); + CompletableFuture>> future = + new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -106,7 +107,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO .after(startingAfter) .build(); List result = parsedResponse.getData(); - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( new SyncPagingIterable(startingAfter.isPresent(), result, () -> { try { return list(nextRequest, requestOptions) @@ -120,30 +121,32 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> retrieve(String componentId) { + public CompletableFuture> retrieve(String componentId) { return retrieve(componentId, null); } - public CompletableFuture> retrieve( + public CompletableFuture> retrieve( String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -162,7 +165,7 @@ public CompletableFuture> retrieve( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -170,35 +173,37 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( TriggersConfigurePropRequest request) { return configureProp(request, null); } - public CompletableFuture> configureProp( + public CompletableFuture> configureProp( TriggersConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -227,43 +232,45 @@ public CompletableFuture> config if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( TriggersReloadPropsRequest request) { return reloadProps(request, null); } - public CompletableFuture> reloadProps( + public CompletableFuture> reloadProps( TriggersReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -292,42 +299,44 @@ public CompletableFuture> reloadPr if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>( + future.complete(new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; } - public CompletableFuture> deploy(DeployTriggerOpts request) { + public CompletableFuture> deploy(DeployTriggerOpts request) { return deploy(request, null); } - public CompletableFuture> deploy( + public CompletableFuture> deploy( DeployTriggerOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -340,7 +349,7 @@ public CompletableFuture> deploy( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -353,7 +362,7 @@ public CompletableFuture> deploy( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { @@ -361,24 +370,26 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO if (response.isSuccessful()) { DeployTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), DeployTriggerResponse.class); - future.complete(new PipedreamApiHttpResponse<>(parsedResponse.getData(), response)); + future.complete(new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/triggers/RawTriggersClient.java b/src/main/java/com/pipedream/api/resources/triggers/RawTriggersClient.java index 83abd08..d2d1eb0 100644 --- a/src/main/java/com/pipedream/api/resources/triggers/RawTriggersClient.java +++ b/src/main/java/com/pipedream/api/resources/triggers/RawTriggersClient.java @@ -7,9 +7,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.MediaTypes; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; import com.pipedream.api.core.pagination.SyncPagingIterable; @@ -42,15 +42,15 @@ public RawTriggersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse> list() { + public PipedreamApiClientHttpResponse> list() { return list(TriggersListRequest.builder().build()); } - public PipedreamApiHttpResponse> list(TriggersListRequest request) { + public PipedreamApiClientHttpResponse> list(TriggersListRequest request) { return list(request, null); } - public PipedreamApiHttpResponse> list( + public PipedreamApiClientHttpResponse> list( TriggersListRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -96,28 +96,28 @@ public PipedreamApiHttpResponse> list( .after(startingAfter) .build(); List result = parsedResponse.getData(); - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( new SyncPagingIterable( startingAfter.isPresent(), result, () -> list(nextRequest, requestOptions) .body()), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse retrieve(String componentId) { + public PipedreamApiClientHttpResponse retrieve(String componentId) { return retrieve(componentId, null); } - public PipedreamApiHttpResponse retrieve(String componentId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse retrieve(String componentId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -140,24 +140,24 @@ public PipedreamApiHttpResponse retrieve(String componentId, RequestO if (response.isSuccessful()) { GetComponentResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), GetComponentResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse configureProp(TriggersConfigurePropRequest request) { + public PipedreamApiClientHttpResponse configureProp(TriggersConfigurePropRequest request) { return configureProp(request, null); } - public PipedreamApiHttpResponse configureProp( + public PipedreamApiClientHttpResponse configureProp( TriggersConfigurePropRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -189,26 +189,26 @@ public PipedreamApiHttpResponse configureProp( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ConfigurePropResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse reloadProps(TriggersReloadPropsRequest request) { + public PipedreamApiClientHttpResponse reloadProps(TriggersReloadPropsRequest request) { return reloadProps(request, null); } - public PipedreamApiHttpResponse reloadProps( + public PipedreamApiClientHttpResponse reloadProps( TriggersReloadPropsRequest request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -240,26 +240,26 @@ public PipedreamApiHttpResponse reloadProps( try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>( + return new PipedreamApiClientHttpResponse<>( ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ReloadPropsResponse.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } - public PipedreamApiHttpResponse deploy(DeployTriggerOpts request) { + public PipedreamApiClientHttpResponse deploy(DeployTriggerOpts request) { return deploy(request, null); } - public PipedreamApiHttpResponse deploy( + public PipedreamApiClientHttpResponse deploy( DeployTriggerOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -272,7 +272,7 @@ public PipedreamApiHttpResponse deploy( body = RequestBody.create( ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON); } catch (JsonProcessingException e) { - throw new PipedreamApiException("Failed to serialize request", e); + throw new PipedreamApiClientException("Failed to serialize request", e); } Request okhttpRequest = new Request.Builder() .url(httpUrl) @@ -290,16 +290,16 @@ public PipedreamApiHttpResponse deploy( if (response.isSuccessful()) { DeployTriggerResponse parsedResponse = ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), DeployTriggerResponse.class); - return new PipedreamApiHttpResponse<>(parsedResponse.getData(), response); + return new PipedreamApiClientHttpResponse<>(parsedResponse.getData(), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } } diff --git a/src/main/java/com/pipedream/api/resources/users/AsyncRawUsersClient.java b/src/main/java/com/pipedream/api/resources/users/AsyncRawUsersClient.java index 5cb2cdb..ead6c91 100644 --- a/src/main/java/com/pipedream/api/resources/users/AsyncRawUsersClient.java +++ b/src/main/java/com/pipedream/api/resources/users/AsyncRawUsersClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import java.io.IOException; import java.util.concurrent.CompletableFuture; @@ -28,11 +28,11 @@ public AsyncRawUsersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> deleteExternalUser(String externalUserId) { + public CompletableFuture> deleteExternalUser(String externalUserId) { return deleteExternalUser(externalUserId, null); } - public CompletableFuture> deleteExternalUser( + public CompletableFuture> deleteExternalUser( String externalUserId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -50,30 +50,32 @@ public CompletableFuture> deleteExternalUser( if (requestOptions != null && requestOptions.getTimeout().isPresent()) { client = clientOptions.httpClientWithTimeout(requestOptions); } - CompletableFuture> future = new CompletableFuture<>(); + CompletableFuture> future = new CompletableFuture<>(); client.newCall(okhttpRequest).enqueue(new Callback() { @Override public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { try (ResponseBody responseBody = response.body()) { if (response.isSuccessful()) { - future.complete(new PipedreamApiHttpResponse<>(null, response)); + future.complete(new PipedreamApiClientHttpResponse<>(null, response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - future.completeExceptionally(new PipedreamApiApiException( + future.completeExceptionally(new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response)); return; } catch (IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } } @Override public void onFailure(@NotNull Call call, @NotNull IOException e) { - future.completeExceptionally(new PipedreamApiException("Network error executing HTTP request", e)); + future.completeExceptionally( + new PipedreamApiClientException("Network error executing HTTP request", e)); } }); return future; diff --git a/src/main/java/com/pipedream/api/resources/users/RawUsersClient.java b/src/main/java/com/pipedream/api/resources/users/RawUsersClient.java index 7fe69c9..b8f58b0 100644 --- a/src/main/java/com/pipedream/api/resources/users/RawUsersClient.java +++ b/src/main/java/com/pipedream/api/resources/users/RawUsersClient.java @@ -5,9 +5,9 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.core.PipedreamApiApiException; -import com.pipedream.api.core.PipedreamApiException; -import com.pipedream.api.core.PipedreamApiHttpResponse; +import com.pipedream.api.core.PipedreamApiClientApiException; +import com.pipedream.api.core.PipedreamApiClientException; +import com.pipedream.api.core.PipedreamApiClientHttpResponse; import com.pipedream.api.core.RequestOptions; import java.io.IOException; import okhttp3.Headers; @@ -24,11 +24,12 @@ public RawUsersClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public PipedreamApiHttpResponse deleteExternalUser(String externalUserId) { + public PipedreamApiClientHttpResponse deleteExternalUser(String externalUserId) { return deleteExternalUser(externalUserId, null); } - public PipedreamApiHttpResponse deleteExternalUser(String externalUserId, RequestOptions requestOptions) { + public PipedreamApiClientHttpResponse deleteExternalUser( + String externalUserId, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -48,16 +49,16 @@ public PipedreamApiHttpResponse deleteExternalUser(String externalUserId, try (Response response = client.newCall(okhttpRequest).execute()) { ResponseBody responseBody = response.body(); if (response.isSuccessful()) { - return new PipedreamApiHttpResponse<>(null, response); + return new PipedreamApiClientHttpResponse<>(null, response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; - throw new PipedreamApiApiException( + throw new PipedreamApiClientApiException( "Error with status code " + response.code(), response.code(), ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class), response); } catch (IOException e) { - throw new PipedreamApiException("Network error executing HTTP request", e); + throw new PipedreamApiClientException("Network error executing HTTP request", e); } } }