From a9649bf1b5c545769aab8a714699a6a86b096714 Mon Sep 17 00:00:00 2001 From: fern-api <115122769+fern-api[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 23:03:57 +0000 Subject: [PATCH] SDK regeneration --- .gradle/8.14.3/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/8.14.3/checksums/md5-checksums.bin | Bin 21897 -> 21897 bytes .gradle/8.14.3/checksums/sha1-checksums.bin | Bin 25679 -> 25679 bytes .../executionHistory/executionHistory.bin | Bin 64148 -> 63951 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.14.3/fileHashes/fileHashes.bin | Bin 35447 -> 35347 bytes .gradle/8.14.3/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 +- README.md | 6 +- build.gradle | 4 +- .../pipedream/api/AsyncBaseClientBuilder.java | 169 ++++++++++++++++-- .../com/pipedream/api/BaseClientBuilder.java | 169 ++++++++++++++++-- .../com/pipedream/api/core/ClientOptions.java | 2 +- .../resources/accounts/AccountsClient.java | 6 +- .../accounts/AsyncAccountsClient.java | 6 +- .../accounts/AsyncRawAccountsClient.java | 6 +- .../resources/accounts/RawAccountsClient.java | 6 +- ...untRequest.java => CreateAccountOpts.java} | 20 +-- .../api/resources/proxy/AsyncProxyClient.java | 26 ++- .../resources/proxy/AsyncRawProxyClient.java | 54 +++--- .../api/resources/proxy/ProxyClient.java | 21 ++- .../api/resources/proxy/RawProxyClient.java | 45 ++--- .../tokens/AsyncRawTokensClient.java | 14 +- .../resources/tokens/AsyncTokensClient.java | 6 +- .../api/resources/tokens/RawTokensClient.java | 15 +- .../api/resources/tokens/TokensClient.java | 6 +- ...TokenRequest.java => CreateTokenOpts.java} | 63 ++----- .../api/types/ConnectTokenCreateOpts.java | 43 +---- .../pipedream/api/types/ProxyResponse.java | 155 ---------------- reference.md | 37 ++-- .../pipedream/api/AsyncBaseClientBuilder.java | 169 ++++++++++++++++-- .../com/pipedream/api/BaseClientBuilder.java | 169 ++++++++++++++++-- .../com/pipedream/api/core/ClientOptions.java | 2 +- .../resources/accounts/AccountsClient.java | 6 +- .../accounts/AsyncAccountsClient.java | 6 +- .../accounts/AsyncRawAccountsClient.java | 6 +- .../resources/accounts/RawAccountsClient.java | 6 +- ...untRequest.java => CreateAccountOpts.java} | 20 +-- .../api/resources/proxy/AsyncProxyClient.java | 26 ++- .../resources/proxy/AsyncRawProxyClient.java | 54 +++--- .../api/resources/proxy/ProxyClient.java | 21 ++- .../api/resources/proxy/RawProxyClient.java | 45 ++--- .../tokens/AsyncRawTokensClient.java | 14 +- .../resources/tokens/AsyncTokensClient.java | 6 +- .../api/resources/tokens/RawTokensClient.java | 15 +- .../api/resources/tokens/TokensClient.java | 6 +- ...TokenRequest.java => CreateTokenOpts.java} | 63 ++----- .../api/types/ConnectTokenCreateOpts.java | 43 +---- .../pipedream/api/types/ProxyResponse.java | 155 ---------------- 50 files changed, 889 insertions(+), 824 deletions(-) rename build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/requests/{CreateAccountRequest.java => CreateAccountOpts.java} (95%) rename build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/requests/{CreateTokenRequest.java => CreateTokenOpts.java} (83%) delete mode 100644 build/spotless/spotlessJava/src/main/java/com/pipedream/api/types/ProxyResponse.java rename src/main/java/com/pipedream/api/resources/accounts/requests/{CreateAccountRequest.java => CreateAccountOpts.java} (95%) rename src/main/java/com/pipedream/api/resources/tokens/requests/{CreateTokenRequest.java => CreateTokenOpts.java} (83%) delete mode 100644 src/main/java/com/pipedream/api/types/ProxyResponse.java diff --git a/.gradle/8.14.3/checksums/checksums.lock b/.gradle/8.14.3/checksums/checksums.lock index 9e16ed75a5dfecd0e03b936eb43226967ae55432..9ceb0c717b65b7b5324d1b25af2835d44c7a8cbf 100644 GIT binary patch literal 17 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 delta 3776 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 diff --git a/.gradle/8.14.3/fileHashes/fileHashes.bin b/.gradle/8.14.3/fileHashes/fileHashes.bin index 7bf2efbf9131bbc3e9419923cc9a275dc9356646..82e18eb1bb6f18482569c1e4c3b6dbe26951ac06 100644 GIT binary patch delta 9056 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 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 2fb7ba3..72f11b3 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Thu Jul 24 19:20:25 UTC 2025 +#Wed Jul 30 23:02:57 UTC 2025 gradle.version=8.14.3 diff --git a/README.md b/README.md index e2ade52..a3de71a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Add the dependency in your `pom.xml` file: com.pipedream pipedream - 0.0.237 + 0.0.255 ``` @@ -37,7 +37,7 @@ Instantiate and use the client with the following: package com.example.usage; import com.pipedream.api.BaseClient; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; public class Example { public static void main(String[] args) { @@ -49,7 +49,7 @@ public class Example { client.accounts().create( "project_id", - CreateAccountRequest + CreateAccountOpts .builder() .appSlug("app_slug") .cfmapJson("cfmap_json") diff --git a/build.gradle b/build.gradle index fd420e0..2a09691 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ java { group = 'com.pipedream' -version = '0.0.237' +version = '0.0.255' jar { dependsOn(":generatePomFileForMavenPublication") @@ -79,7 +79,7 @@ publishing { maven(MavenPublication) { groupId = 'com.pipedream' artifactId = 'pipedream' - version = '0.0.237' + version = '0.0.255' from components.java pom { name = 'pipedream' diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java index e6b8839..9361d1d 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java @@ -7,10 +7,13 @@ import com.pipedream.api.core.Environment; import com.pipedream.api.core.OAuthTokenSupplier; import com.pipedream.api.resources.oauthtokens.OauthTokensClient; +import java.util.Optional; import okhttp3.OkHttpClient; public class AsyncBaseClientBuilder { - private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); + private Optional timeout = Optional.empty(); + + private Optional maxRetries = Optional.empty(); private String clientId = System.getenv("PIPEDREAM_CLIENT_ID"); @@ -20,6 +23,8 @@ public class AsyncBaseClientBuilder { private Environment environment = Environment.PROD; + private OkHttpClient httpClient; + /** * Sets clientId. * Defaults to the PIPEDREAM_CLIENT_ID environment variable. @@ -60,7 +65,7 @@ public AsyncBaseClientBuilder url(String url) { * Sets the timeout (in seconds) for the client. Defaults to 60 seconds. */ public AsyncBaseClientBuilder timeout(int timeout) { - this.clientOptionsBuilder.timeout(timeout); + this.timeout = Optional.of(timeout); return this; } @@ -68,7 +73,7 @@ public AsyncBaseClientBuilder timeout(int timeout) { * Sets the maximum number of retries for the client. Defaults to 2 retries. */ public AsyncBaseClientBuilder maxRetries(int maxRetries) { - this.clientOptionsBuilder.maxRetries(maxRetries); + this.maxRetries = Optional.of(maxRetries); return this; } @@ -76,7 +81,7 @@ public AsyncBaseClientBuilder maxRetries(int maxRetries) { * Sets the underlying OkHttp client */ public AsyncBaseClientBuilder httpClient(OkHttpClient httpClient) { - this.clientOptionsBuilder.httpClient(httpClient); + this.httpClient = httpClient; return this; } @@ -86,18 +91,156 @@ public AsyncBaseClientBuilder projectId(String projectId) { } protected ClientOptions buildClientOptions() { - clientOptionsBuilder.environment(this.environment); - return clientOptionsBuilder.build(); + ClientOptions.Builder builder = ClientOptions.builder(); + setEnvironment(builder); + setAuthentication(builder); + setCustomHeaders(builder); + setVariables(builder); + setHttpClient(builder); + setTimeouts(builder); + setRetries(builder); + setAdditional(builder); + return builder.build(); } - public AsyncBaseClient build() { - OauthTokensClient authClient = new OauthTokensClient( - ClientOptions.builder().environment(this.environment).build()); - OAuthTokenSupplier oAuthTokenSupplier = new OAuthTokenSupplier(clientId, clientSecret, authClient); - this.clientOptionsBuilder.addHeader("Authorization", oAuthTokenSupplier); - if (projectEnvironment != null) { - this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment); + /** + * Sets the environment configuration for the client. + * Override this method to modify URLs or add environment-specific logic. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setEnvironment(ClientOptions.Builder builder) { + builder.environment(this.environment); + } + + /** + * Override this method to customize authentication. + * This method is called during client options construction to set up authentication headers. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAuthentication(ClientOptions.Builder builder) {
+     *     super.setAuthentication(builder); // Keep existing auth
+     *     builder.addHeader("X-API-Key", this.apiKey);
+     * }
+     * }
+ */ + protected void setAuthentication(ClientOptions.Builder builder) { + if (this.clientId != null && this.clientSecret != null) { + OauthTokensClient authClient = new OauthTokensClient( + ClientOptions.builder().environment(this.environment).build()); + OAuthTokenSupplier oAuthTokenSupplier = + new OAuthTokenSupplier(this.clientId, this.clientSecret, authClient); + builder.addHeader("Authorization", oAuthTokenSupplier); } + } + + /** + * Override this method to add or modify custom headers. + * This method is called during client options construction to set up custom headers defined in the API. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setCustomHeaders(ClientOptions.Builder builder) {
+     *     super.setCustomHeaders(builder); // Keep existing headers
+     *     builder.addHeader("X-Trace-ID", generateTraceId());
+     * }
+     * }
+ */ + protected void setCustomHeaders(ClientOptions.Builder builder) { + if (this.projectEnvironment != null) { + builder.addHeader("x-pd-environment", this.projectEnvironment); + } + } + + /** + * Override this method to configure API variables defined in the specification. + * Available variables: projectId + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setVariables(ClientOptions.Builder builder) {} + + /** + * Sets the request timeout configuration. + * Override this method to customize timeout behavior. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setTimeouts(ClientOptions.Builder builder) { + if (this.timeout.isPresent()) { + builder.timeout(this.timeout.get()); + } + } + + /** + * Sets the retry configuration for failed requests. + * Override this method to implement custom retry strategies. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setRetries(ClientOptions.Builder builder) { + if (this.maxRetries.isPresent()) { + builder.maxRetries(this.maxRetries.get()); + } + } + + /** + * Sets the OkHttp client configuration. + * Override this method to customize HTTP client behavior (interceptors, connection pools, etc). + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setHttpClient(ClientOptions.Builder builder) { + if (this.httpClient != null) { + builder.httpClient(this.httpClient); + } + } + + /** + * Override this method to add any additional configuration to the client. + * This method is called at the end of the configuration chain, allowing you to add + * custom headers, modify settings, or perform any other client customization. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAdditional(ClientOptions.Builder builder) {
+     *     builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
+     *     builder.addHeader("X-Client-Version", "1.0.0");
+     * }
+     * }
+ */ + protected void setAdditional(ClientOptions.Builder builder) {} + + /** + * Override this method to add custom validation logic before the client is built. + * This method is called at the beginning of the build() method to ensure the configuration is valid. + * Throw an exception to prevent client creation if validation fails. + * + * Example: + * 
{@code
+     * @Override
+     * protected void validateConfiguration() {
+     *     super.validateConfiguration(); // Run parent validations
+     *     if (tenantId == null || tenantId.isEmpty()) {
+     *         throw new IllegalStateException("tenantId is required");
+     *     }
+     * }
+     * }
+ */ + protected void validateConfiguration() {} + + public AsyncBaseClient build() { + validateConfiguration(); return new AsyncBaseClient(buildClientOptions()); } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/BaseClientBuilder.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/BaseClientBuilder.java index 000caa1..13318cd 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/BaseClientBuilder.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/BaseClientBuilder.java @@ -7,10 +7,13 @@ import com.pipedream.api.core.Environment; import com.pipedream.api.core.OAuthTokenSupplier; import com.pipedream.api.resources.oauthtokens.OauthTokensClient; +import java.util.Optional; import okhttp3.OkHttpClient; public class BaseClientBuilder { - private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); + private Optional timeout = Optional.empty(); + + private Optional maxRetries = Optional.empty(); private String clientId = System.getenv("PIPEDREAM_CLIENT_ID"); @@ -20,6 +23,8 @@ public class BaseClientBuilder { private Environment environment = Environment.PROD; + private OkHttpClient httpClient; + /** * Sets clientId. * Defaults to the PIPEDREAM_CLIENT_ID environment variable. @@ -60,7 +65,7 @@ public BaseClientBuilder url(String url) { * Sets the timeout (in seconds) for the client. Defaults to 60 seconds. */ public BaseClientBuilder timeout(int timeout) { - this.clientOptionsBuilder.timeout(timeout); + this.timeout = Optional.of(timeout); return this; } @@ -68,7 +73,7 @@ public BaseClientBuilder timeout(int timeout) { * Sets the maximum number of retries for the client. Defaults to 2 retries. */ public BaseClientBuilder maxRetries(int maxRetries) { - this.clientOptionsBuilder.maxRetries(maxRetries); + this.maxRetries = Optional.of(maxRetries); return this; } @@ -76,7 +81,7 @@ public BaseClientBuilder maxRetries(int maxRetries) { * Sets the underlying OkHttp client */ public BaseClientBuilder httpClient(OkHttpClient httpClient) { - this.clientOptionsBuilder.httpClient(httpClient); + this.httpClient = httpClient; return this; } @@ -86,18 +91,156 @@ public BaseClientBuilder projectId(String projectId) { } protected ClientOptions buildClientOptions() { - clientOptionsBuilder.environment(this.environment); - return clientOptionsBuilder.build(); + ClientOptions.Builder builder = ClientOptions.builder(); + setEnvironment(builder); + setAuthentication(builder); + setCustomHeaders(builder); + setVariables(builder); + setHttpClient(builder); + setTimeouts(builder); + setRetries(builder); + setAdditional(builder); + return builder.build(); } - public BaseClient build() { - OauthTokensClient authClient = new OauthTokensClient( - ClientOptions.builder().environment(this.environment).build()); - OAuthTokenSupplier oAuthTokenSupplier = new OAuthTokenSupplier(clientId, clientSecret, authClient); - this.clientOptionsBuilder.addHeader("Authorization", oAuthTokenSupplier); - if (projectEnvironment != null) { - this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment); + /** + * Sets the environment configuration for the client. + * Override this method to modify URLs or add environment-specific logic. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setEnvironment(ClientOptions.Builder builder) { + builder.environment(this.environment); + } + + /** + * Override this method to customize authentication. + * This method is called during client options construction to set up authentication headers. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAuthentication(ClientOptions.Builder builder) {
+     *     super.setAuthentication(builder); // Keep existing auth
+     *     builder.addHeader("X-API-Key", this.apiKey);
+     * }
+     * }
+ */ + protected void setAuthentication(ClientOptions.Builder builder) { + if (this.clientId != null && this.clientSecret != null) { + OauthTokensClient authClient = new OauthTokensClient( + ClientOptions.builder().environment(this.environment).build()); + OAuthTokenSupplier oAuthTokenSupplier = + new OAuthTokenSupplier(this.clientId, this.clientSecret, authClient); + builder.addHeader("Authorization", oAuthTokenSupplier); } + } + + /** + * Override this method to add or modify custom headers. + * This method is called during client options construction to set up custom headers defined in the API. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setCustomHeaders(ClientOptions.Builder builder) {
+     *     super.setCustomHeaders(builder); // Keep existing headers
+     *     builder.addHeader("X-Trace-ID", generateTraceId());
+     * }
+     * }
+ */ + protected void setCustomHeaders(ClientOptions.Builder builder) { + if (this.projectEnvironment != null) { + builder.addHeader("x-pd-environment", this.projectEnvironment); + } + } + + /** + * Override this method to configure API variables defined in the specification. + * Available variables: projectId + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setVariables(ClientOptions.Builder builder) {} + + /** + * Sets the request timeout configuration. + * Override this method to customize timeout behavior. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setTimeouts(ClientOptions.Builder builder) { + if (this.timeout.isPresent()) { + builder.timeout(this.timeout.get()); + } + } + + /** + * Sets the retry configuration for failed requests. + * Override this method to implement custom retry strategies. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setRetries(ClientOptions.Builder builder) { + if (this.maxRetries.isPresent()) { + builder.maxRetries(this.maxRetries.get()); + } + } + + /** + * Sets the OkHttp client configuration. + * Override this method to customize HTTP client behavior (interceptors, connection pools, etc). + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setHttpClient(ClientOptions.Builder builder) { + if (this.httpClient != null) { + builder.httpClient(this.httpClient); + } + } + + /** + * Override this method to add any additional configuration to the client. + * This method is called at the end of the configuration chain, allowing you to add + * custom headers, modify settings, or perform any other client customization. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAdditional(ClientOptions.Builder builder) {
+     *     builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
+     *     builder.addHeader("X-Client-Version", "1.0.0");
+     * }
+     * }
+ */ + protected void setAdditional(ClientOptions.Builder builder) {} + + /** + * Override this method to add custom validation logic before the client is built. + * This method is called at the beginning of the build() method to ensure the configuration is valid. + * Throw an exception to prevent client creation if validation fails. + * + * Example: + * 
{@code
+     * @Override
+     * protected void validateConfiguration() {
+     *     super.validateConfiguration(); // Run parent validations
+     *     if (tenantId == null || tenantId.isEmpty()) {
+     *         throw new IllegalStateException("tenantId is required");
+     *     }
+     * }
+     * }
+ */ + protected void validateConfiguration() {} + + public BaseClient build() { + validateConfiguration(); return new BaseClient(buildClientOptions()); } } 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 524ee4e..bd94c5e 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.237"); + put("X-Fern-SDK-Version", "0.0.255"); } }); this.headerSuppliers = headerSuppliers; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java index 81f9441..4e8b110 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java @@ -8,7 +8,7 @@ import com.pipedream.api.core.pagination.SyncPagingIterable; import com.pipedream.api.resources.accounts.requests.AccountsListRequest; import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; import com.pipedream.api.types.Account; public class AccountsClient { @@ -40,11 +40,11 @@ public SyncPagingIterable list(AccountsListRequest request, RequestOpti return this.rawClient.list(request, requestOptions).body(); } - public Account create(CreateAccountRequest request) { + public Account create(CreateAccountOpts request) { return this.rawClient.create(request).body(); } - public Account create(CreateAccountRequest request, RequestOptions requestOptions) { + public Account create(CreateAccountOpts request, RequestOptions requestOptions) { return this.rawClient.create(request, requestOptions).body(); } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java index 761a206..34158ac 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java @@ -8,7 +8,7 @@ import com.pipedream.api.core.pagination.SyncPagingIterable; import com.pipedream.api.resources.accounts.requests.AccountsListRequest; import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; import com.pipedream.api.types.Account; import java.util.concurrent.CompletableFuture; @@ -42,11 +42,11 @@ public CompletableFuture> list( return this.rawClient.list(request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture create(CreateAccountRequest request) { + public CompletableFuture create(CreateAccountOpts request) { return this.rawClient.create(request).thenApply(response -> response.body()); } - public CompletableFuture create(CreateAccountRequest request, RequestOptions requestOptions) { + public CompletableFuture create(CreateAccountOpts request, RequestOptions requestOptions) { return this.rawClient.create(request, requestOptions).thenApply(response -> response.body()); } 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 59601c1..ea4f83a 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 @@ -14,7 +14,7 @@ import com.pipedream.api.core.pagination.SyncPagingIterable; import com.pipedream.api.resources.accounts.requests.AccountsListRequest; import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; import com.pipedream.api.types.Account; import com.pipedream.api.types.ListAccountsResponse; import java.io.IOException; @@ -146,12 +146,12 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { return future; } - public CompletableFuture> create(CreateAccountRequest request) { + public CompletableFuture> create(CreateAccountOpts request) { return create(request, null); } public CompletableFuture> create( - CreateAccountRequest request, RequestOptions requestOptions) { + CreateAccountOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") 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 e90fe31..5fb30da 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 @@ -14,7 +14,7 @@ import com.pipedream.api.core.pagination.SyncPagingIterable; import com.pipedream.api.resources.accounts.requests.AccountsListRequest; import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; import com.pipedream.api.types.Account; import com.pipedream.api.types.ListAccountsResponse; import java.io.IOException; @@ -121,11 +121,11 @@ public BaseClientHttpResponse> list( } } - public BaseClientHttpResponse create(CreateAccountRequest request) { + public BaseClientHttpResponse create(CreateAccountOpts request) { return create(request, null); } - public BaseClientHttpResponse create(CreateAccountRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse create(CreateAccountOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") 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/CreateAccountOpts.java similarity index 95% rename from build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java rename to build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountOpts.java index aeec52a..79cef5e 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/CreateAccountOpts.java @@ -19,8 +19,8 @@ import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = CreateAccountRequest.Builder.class) -public final class CreateAccountRequest { +@JsonDeserialize(builder = CreateAccountOpts.Builder.class) +public final class CreateAccountOpts { private final Optional appId; private final Optional externalUserId; @@ -37,7 +37,7 @@ public final class CreateAccountRequest { private final Map additionalProperties; - private CreateAccountRequest( + private CreateAccountOpts( Optional appId, Optional externalUserId, Optional oauthAppId, @@ -112,7 +112,7 @@ public Optional getName() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof CreateAccountRequest && equalTo((CreateAccountRequest) other); + return other instanceof CreateAccountOpts && equalTo((CreateAccountOpts) other); } @JsonAnyGetter @@ -120,7 +120,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(CreateAccountRequest other) { + private boolean equalTo(CreateAccountOpts other) { return appId.equals(other.appId) && externalUserId.equals(other.externalUserId) && oauthAppId.equals(other.oauthAppId) @@ -157,7 +157,7 @@ public interface AppSlugStage { */ CfmapJsonStage appSlug(@NotNull String appSlug); - Builder from(CreateAccountRequest other); + Builder from(CreateAccountOpts other); } public interface CfmapJsonStage { @@ -175,7 +175,7 @@ public interface ConnectTokenStage { } public interface _FinalStage { - CreateAccountRequest build(); + CreateAccountOpts build(); /** *

The app slug or ID to filter accounts by.

@@ -225,7 +225,7 @@ public static final class Builder implements AppSlugStage, CfmapJsonStage, Conne private Builder() {} @java.lang.Override - public Builder from(CreateAccountRequest other) { + public Builder from(CreateAccountOpts other) { appId(other.getAppId()); externalUserId(other.getExternalUserId()); oauthAppId(other.getOauthAppId()); @@ -346,8 +346,8 @@ public _FinalStage appId(Optional appId) { } @java.lang.Override - public CreateAccountRequest build() { - return new CreateAccountRequest( + public CreateAccountOpts build() { + return new CreateAccountOpts( appId, externalUserId, oauthAppId, appSlug, cfmapJson, connectToken, name, additionalProperties); } } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java index 61bcd21..fd06a93 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java @@ -10,7 +10,6 @@ import com.pipedream.api.resources.proxy.requests.ProxyPatchRequest; import com.pipedream.api.resources.proxy.requests.ProxyPostRequest; import com.pipedream.api.resources.proxy.requests.ProxyPutRequest; -import java.util.Map; import java.util.concurrent.CompletableFuture; public class AsyncProxyClient { @@ -30,48 +29,43 @@ public AsyncRawProxyClient withRawResponse() { return this.rawClient; } - public CompletableFuture> get(String url64, ProxyGetRequest request) { + public CompletableFuture get(String url64, ProxyGetRequest request) { return this.rawClient.get(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> get( - String url64, ProxyGetRequest request, RequestOptions requestOptions) { + public CompletableFuture get(String url64, ProxyGetRequest request, RequestOptions requestOptions) { return this.rawClient.get(url64, request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture> post(String url64, ProxyPostRequest request) { + public CompletableFuture post(String url64, ProxyPostRequest request) { return this.rawClient.post(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> post( - String url64, ProxyPostRequest request, RequestOptions requestOptions) { + public CompletableFuture post(String url64, ProxyPostRequest request, RequestOptions requestOptions) { return this.rawClient.post(url64, request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture> put(String url64, ProxyPutRequest request) { + public CompletableFuture put(String url64, ProxyPutRequest request) { return this.rawClient.put(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> put( - String url64, ProxyPutRequest request, RequestOptions requestOptions) { + public CompletableFuture put(String url64, ProxyPutRequest request, RequestOptions requestOptions) { return this.rawClient.put(url64, request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture> delete(String url64, ProxyDeleteRequest request) { + public CompletableFuture delete(String url64, ProxyDeleteRequest request) { return this.rawClient.delete(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> delete( - String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { + public CompletableFuture delete(String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { return this.rawClient.delete(url64, request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture> patch(String url64, ProxyPatchRequest request) { + public CompletableFuture patch(String url64, ProxyPatchRequest request) { return this.rawClient.patch(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> patch( - String url64, ProxyPatchRequest request, RequestOptions requestOptions) { + public CompletableFuture patch(String url64, ProxyPatchRequest request, RequestOptions requestOptions) { return this.rawClient.patch(url64, request, requestOptions).thenApply(response -> response.body()); } } 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 30ca813..24f27f3 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 @@ -3,7 +3,6 @@ */ package com.pipedream.api.resources.proxy; -import com.fasterxml.jackson.core.type.TypeReference; import com.pipedream.api.core.BaseClientApiException; import com.pipedream.api.core.BaseClientException; import com.pipedream.api.core.BaseClientHttpResponse; @@ -18,7 +17,6 @@ import com.pipedream.api.resources.proxy.requests.ProxyPostRequest; import com.pipedream.api.resources.proxy.requests.ProxyPutRequest; import java.io.IOException; -import java.util.Map; import java.util.concurrent.CompletableFuture; import okhttp3.Call; import okhttp3.Callback; @@ -38,11 +36,11 @@ 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,16 +60,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; @@ -94,11 +90,11 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { return future; } - public CompletableFuture>> post(String url64, ProxyPostRequest request) { + 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() @@ -126,16 +122,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; @@ -158,11 +152,11 @@ public void onFailure(@NotNull Call call, @NotNull IOException 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() @@ -190,16 +184,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; @@ -222,12 +214,11 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { return future; } - public CompletableFuture>> delete( - String url64, ProxyDeleteRequest request) { + 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() @@ -247,16 +238,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; @@ -279,12 +268,11 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { return future; } - public CompletableFuture>> patch( - String url64, ProxyPatchRequest request) { + 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() @@ -312,16 +300,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java index aa27dba..a7e22d7 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java @@ -10,7 +10,6 @@ import com.pipedream.api.resources.proxy.requests.ProxyPatchRequest; import com.pipedream.api.resources.proxy.requests.ProxyPostRequest; import com.pipedream.api.resources.proxy.requests.ProxyPutRequest; -import java.util.Map; public class ProxyClient { protected final ClientOptions clientOptions; @@ -29,43 +28,43 @@ public RawProxyClient withRawResponse() { return this.rawClient; } - public Map get(String url64, ProxyGetRequest request) { + public Object get(String url64, ProxyGetRequest request) { return this.rawClient.get(url64, request).body(); } - public Map get(String url64, ProxyGetRequest request, RequestOptions requestOptions) { + public Object get(String url64, ProxyGetRequest request, RequestOptions requestOptions) { return this.rawClient.get(url64, request, requestOptions).body(); } - public Map post(String url64, ProxyPostRequest request) { + public Object post(String url64, ProxyPostRequest request) { return this.rawClient.post(url64, request).body(); } - public Map post(String url64, ProxyPostRequest request, RequestOptions requestOptions) { + public Object post(String url64, ProxyPostRequest request, RequestOptions requestOptions) { return this.rawClient.post(url64, request, requestOptions).body(); } - public Map put(String url64, ProxyPutRequest request) { + public Object put(String url64, ProxyPutRequest request) { return this.rawClient.put(url64, request).body(); } - public Map put(String url64, ProxyPutRequest request, RequestOptions requestOptions) { + public Object put(String url64, ProxyPutRequest request, RequestOptions requestOptions) { return this.rawClient.put(url64, request, requestOptions).body(); } - public Map delete(String url64, ProxyDeleteRequest request) { + public Object delete(String url64, ProxyDeleteRequest request) { return this.rawClient.delete(url64, request).body(); } - public Map delete(String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { + public Object delete(String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { return this.rawClient.delete(url64, request, requestOptions).body(); } - public Map patch(String url64, ProxyPatchRequest request) { + public Object patch(String url64, ProxyPatchRequest request) { return this.rawClient.patch(url64, request).body(); } - public Map patch(String url64, ProxyPatchRequest request, RequestOptions requestOptions) { + public Object patch(String url64, ProxyPatchRequest request, RequestOptions requestOptions) { return this.rawClient.patch(url64, request, requestOptions).body(); } } 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 fb9c5bf..8bfb9ec 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 @@ -3,7 +3,6 @@ */ package com.pipedream.api.resources.proxy; -import com.fasterxml.jackson.core.type.TypeReference; import com.pipedream.api.core.BaseClientApiException; import com.pipedream.api.core.BaseClientException; import com.pipedream.api.core.BaseClientHttpResponse; @@ -18,7 +17,6 @@ import com.pipedream.api.resources.proxy.requests.ProxyPostRequest; import com.pipedream.api.resources.proxy.requests.ProxyPutRequest; import java.io.IOException; -import java.util.Map; import okhttp3.Headers; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -34,12 +32,11 @@ public RawProxyClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public BaseClientHttpResponse> get(String url64, ProxyGetRequest request) { + public BaseClientHttpResponse get(String url64, ProxyGetRequest request) { return get(url64, request, null); } - public BaseClientHttpResponse> get( - String url64, ProxyGetRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse get(String url64, ProxyGetRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -62,9 +59,7 @@ public BaseClientHttpResponse> get( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( @@ -77,12 +72,11 @@ public BaseClientHttpResponse> get( } } - public BaseClientHttpResponse> post(String url64, ProxyPostRequest request) { + public BaseClientHttpResponse post(String url64, ProxyPostRequest request) { return post(url64, request, null); } - public BaseClientHttpResponse> post( - String url64, ProxyPostRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse post(String url64, ProxyPostRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -113,9 +107,7 @@ public BaseClientHttpResponse> post( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( @@ -128,12 +120,11 @@ public BaseClientHttpResponse> post( } } - public BaseClientHttpResponse> put(String url64, ProxyPutRequest request) { + public BaseClientHttpResponse put(String url64, ProxyPutRequest request) { return put(url64, request, null); } - public BaseClientHttpResponse> put( - String url64, ProxyPutRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse put(String url64, ProxyPutRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -164,9 +155,7 @@ public BaseClientHttpResponse> put( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( @@ -179,11 +168,11 @@ public BaseClientHttpResponse> put( } } - public BaseClientHttpResponse> delete(String url64, ProxyDeleteRequest request) { + public BaseClientHttpResponse delete(String url64, ProxyDeleteRequest request) { return delete(url64, request, null); } - public BaseClientHttpResponse> delete( + public BaseClientHttpResponse delete( String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -207,9 +196,7 @@ public BaseClientHttpResponse> delete( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( @@ -222,11 +209,11 @@ public BaseClientHttpResponse> delete( } } - public BaseClientHttpResponse> patch(String url64, ProxyPatchRequest request) { + public BaseClientHttpResponse patch(String url64, ProxyPatchRequest request) { return patch(url64, request, null); } - public BaseClientHttpResponse> patch( + public BaseClientHttpResponse patch( String url64, ProxyPatchRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -258,9 +245,7 @@ public BaseClientHttpResponse> patch( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( 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 84570a9..e6f7c8c 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 @@ -12,7 +12,7 @@ import com.pipedream.api.core.ObjectMappers; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; -import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; +import com.pipedream.api.resources.tokens.requests.CreateTokenOpts; import com.pipedream.api.resources.tokens.requests.TokensValidateRequest; import com.pipedream.api.types.CreateTokenResponse; import com.pipedream.api.types.ValidateTokenResponse; @@ -36,15 +36,17 @@ public AsyncRawTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> create(CreateTokenRequest request) { + public CompletableFuture> create(CreateTokenOpts request) { return create(request, null); } public CompletableFuture> create( - CreateTokenRequest request, RequestOptions requestOptions) { + CreateTokenOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() - .addPathSegments("v1/connect/tokens") + .addPathSegments("v1/connect") + .addPathSegment(clientOptions.projectId()) + .addPathSegments("tokens") .build(); RequestBody body; try { @@ -108,7 +110,9 @@ public CompletableFuture> validate String ctok, TokensValidateRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() - .addPathSegments("v1/connect/tokens") + .addPathSegments("v1/connect") + .addPathSegment(clientOptions.projectId()) + .addPathSegments("tokens") .addPathSegment(ctok) .addPathSegments("validate"); if (request.getParams().isPresent()) { diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/AsyncTokensClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/AsyncTokensClient.java index eef98a0..e918132 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/AsyncTokensClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/AsyncTokensClient.java @@ -5,7 +5,7 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.RequestOptions; -import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; +import com.pipedream.api.resources.tokens.requests.CreateTokenOpts; import com.pipedream.api.resources.tokens.requests.TokensValidateRequest; import com.pipedream.api.types.CreateTokenResponse; import com.pipedream.api.types.ValidateTokenResponse; @@ -28,11 +28,11 @@ public AsyncRawTokensClient withRawResponse() { return this.rawClient; } - public CompletableFuture create(CreateTokenRequest request) { + public CompletableFuture create(CreateTokenOpts request) { return this.rawClient.create(request).thenApply(response -> response.body()); } - public CompletableFuture create(CreateTokenRequest request, RequestOptions requestOptions) { + public CompletableFuture create(CreateTokenOpts request, RequestOptions requestOptions) { return this.rawClient.create(request, requestOptions).thenApply(response -> response.body()); } 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 b18022c..7b0a9de 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 @@ -12,7 +12,7 @@ import com.pipedream.api.core.ObjectMappers; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; -import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; +import com.pipedream.api.resources.tokens.requests.CreateTokenOpts; import com.pipedream.api.resources.tokens.requests.TokensValidateRequest; import com.pipedream.api.types.CreateTokenResponse; import com.pipedream.api.types.ValidateTokenResponse; @@ -32,15 +32,16 @@ public RawTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public BaseClientHttpResponse create(CreateTokenRequest request) { + public BaseClientHttpResponse create(CreateTokenOpts request) { return create(request, null); } - public BaseClientHttpResponse create( - CreateTokenRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse create(CreateTokenOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() - .addPathSegments("v1/connect/tokens") + .addPathSegments("v1/connect") + .addPathSegment(clientOptions.projectId()) + .addPathSegments("tokens") .build(); RequestBody body; try { @@ -90,7 +91,9 @@ public BaseClientHttpResponse validate( String ctok, TokensValidateRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() - .addPathSegments("v1/connect/tokens") + .addPathSegments("v1/connect") + .addPathSegment(clientOptions.projectId()) + .addPathSegments("tokens") .addPathSegment(ctok) .addPathSegments("validate"); if (request.getParams().isPresent()) { diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/TokensClient.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/TokensClient.java index 98801f4..39c90ad 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/TokensClient.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/TokensClient.java @@ -5,7 +5,7 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.RequestOptions; -import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; +import com.pipedream.api.resources.tokens.requests.CreateTokenOpts; import com.pipedream.api.resources.tokens.requests.TokensValidateRequest; import com.pipedream.api.types.CreateTokenResponse; import com.pipedream.api.types.ValidateTokenResponse; @@ -27,11 +27,11 @@ public RawTokensClient withRawResponse() { return this.rawClient; } - public CreateTokenResponse create(CreateTokenRequest request) { + public CreateTokenResponse create(CreateTokenOpts request) { return this.rawClient.create(request).body(); } - public CreateTokenResponse create(CreateTokenRequest request, RequestOptions requestOptions) { + public CreateTokenResponse create(CreateTokenOpts request, RequestOptions requestOptions) { return this.rawClient.create(request, requestOptions).body(); } diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenRequest.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenOpts.java similarity index 83% rename from build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenRequest.java rename to build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenOpts.java index 9ec9c19..c781251 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenRequest.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenOpts.java @@ -20,34 +20,30 @@ import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = CreateTokenRequest.Builder.class) -public final class CreateTokenRequest { +@JsonDeserialize(builder = CreateTokenOpts.Builder.class) +public final class CreateTokenOpts { private final Optional> allowedOrigins; private final Optional errorRedirectUri; private final String externalUserId; - private final String projectId; - private final Optional successRedirectUri; private final Optional webhookUri; private final Map additionalProperties; - private CreateTokenRequest( + private CreateTokenOpts( Optional> allowedOrigins, Optional errorRedirectUri, String externalUserId, - String projectId, Optional successRedirectUri, Optional webhookUri, Map additionalProperties) { this.allowedOrigins = allowedOrigins; this.errorRedirectUri = errorRedirectUri; this.externalUserId = externalUserId; - this.projectId = projectId; this.successRedirectUri = successRedirectUri; this.webhookUri = webhookUri; this.additionalProperties = additionalProperties; @@ -77,14 +73,6 @@ public String getExternalUserId() { return externalUserId; } - /** - * @return The ID of the project - */ - @JsonProperty("project_id") - public String getProjectId() { - return projectId; - } - /** * @return URI to redirect to on success */ @@ -104,7 +92,7 @@ public Optional getWebhookUri() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof CreateTokenRequest && equalTo((CreateTokenRequest) other); + return other instanceof CreateTokenOpts && equalTo((CreateTokenOpts) other); } @JsonAnyGetter @@ -112,11 +100,10 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(CreateTokenRequest other) { + private boolean equalTo(CreateTokenOpts other) { return allowedOrigins.equals(other.allowedOrigins) && errorRedirectUri.equals(other.errorRedirectUri) && externalUserId.equals(other.externalUserId) - && projectId.equals(other.projectId) && successRedirectUri.equals(other.successRedirectUri) && webhookUri.equals(other.webhookUri); } @@ -127,7 +114,6 @@ public int hashCode() { this.allowedOrigins, this.errorRedirectUri, this.externalUserId, - this.projectId, this.successRedirectUri, this.webhookUri); } @@ -145,20 +131,13 @@ public interface ExternalUserIdStage { /** *

Your end user ID, for whom you're creating the token

*/ - ProjectIdStage externalUserId(@NotNull String externalUserId); + _FinalStage externalUserId(@NotNull String externalUserId); - Builder from(CreateTokenRequest other); - } - - public interface ProjectIdStage { - /** - *

The ID of the project

- */ - _FinalStage projectId(@NotNull String projectId); + Builder from(CreateTokenOpts other); } public interface _FinalStage { - CreateTokenRequest build(); + CreateTokenOpts build(); /** *

List of allowed origins for CORS

@@ -190,11 +169,9 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements ExternalUserIdStage, ProjectIdStage, _FinalStage { + public static final class Builder implements ExternalUserIdStage, _FinalStage { private String externalUserId; - private String projectId; - private Optional webhookUri = Optional.empty(); private Optional successRedirectUri = Optional.empty(); @@ -209,11 +186,10 @@ public static final class Builder implements ExternalUserIdStage, ProjectIdStage private Builder() {} @java.lang.Override - public Builder from(CreateTokenRequest other) { + public Builder from(CreateTokenOpts other) { allowedOrigins(other.getAllowedOrigins()); errorRedirectUri(other.getErrorRedirectUri()); externalUserId(other.getExternalUserId()); - projectId(other.getProjectId()); successRedirectUri(other.getSuccessRedirectUri()); webhookUri(other.getWebhookUri()); return this; @@ -226,23 +202,11 @@ public Builder from(CreateTokenRequest other) { */ @java.lang.Override @JsonSetter("external_user_id") - public ProjectIdStage externalUserId(@NotNull String externalUserId) { + public _FinalStage externalUserId(@NotNull String externalUserId) { this.externalUserId = Objects.requireNonNull(externalUserId, "externalUserId must not be null"); return this; } - /** - *

The ID of the project

- *

The ID of the project

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

Webhook URI for notifications

* @return Reference to {@code this} so that method calls can be chained together. @@ -324,12 +288,11 @@ public _FinalStage allowedOrigins(Optional> allowedOrigins) { } @java.lang.Override - public CreateTokenRequest build() { - return new CreateTokenRequest( + public CreateTokenOpts build() { + return new CreateTokenOpts( allowedOrigins, errorRedirectUri, externalUserId, - projectId, successRedirectUri, webhookUri, additionalProperties); diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/types/ConnectTokenCreateOpts.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/types/ConnectTokenCreateOpts.java index 212cb99..fa61409 100644 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/types/ConnectTokenCreateOpts.java +++ b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/types/ConnectTokenCreateOpts.java @@ -24,8 +24,6 @@ public final class ConnectTokenCreateOpts { private final String externalUserId; - private final String projectId; - private final Optional> allowedOrigins; private final Optional errorRedirectUri; @@ -38,14 +36,12 @@ public final class ConnectTokenCreateOpts { private ConnectTokenCreateOpts( String externalUserId, - String projectId, Optional> allowedOrigins, Optional errorRedirectUri, Optional successRedirectUri, Optional webhookUri, Map additionalProperties) { this.externalUserId = externalUserId; - this.projectId = projectId; this.allowedOrigins = allowedOrigins; this.errorRedirectUri = errorRedirectUri; this.successRedirectUri = successRedirectUri; @@ -61,14 +57,6 @@ public String getExternalUserId() { return externalUserId; } - /** - * @return The ID of the project - */ - @JsonProperty("project_id") - public String getProjectId() { - return projectId; - } - /** * @return List of allowed origins for CORS */ @@ -114,7 +102,6 @@ public Map getAdditionalProperties() { private boolean equalTo(ConnectTokenCreateOpts other) { return externalUserId.equals(other.externalUserId) - && projectId.equals(other.projectId) && allowedOrigins.equals(other.allowedOrigins) && errorRedirectUri.equals(other.errorRedirectUri) && successRedirectUri.equals(other.successRedirectUri) @@ -125,7 +112,6 @@ private boolean equalTo(ConnectTokenCreateOpts other) { public int hashCode() { return Objects.hash( this.externalUserId, - this.projectId, this.allowedOrigins, this.errorRedirectUri, this.successRedirectUri, @@ -145,18 +131,11 @@ public interface ExternalUserIdStage { /** *

Your end user ID, for whom you're creating the token

*/ - ProjectIdStage externalUserId(@NotNull String externalUserId); + _FinalStage externalUserId(@NotNull String externalUserId); Builder from(ConnectTokenCreateOpts other); } - public interface ProjectIdStage { - /** - *

The ID of the project

- */ - _FinalStage projectId(@NotNull String projectId); - } - public interface _FinalStage { ConnectTokenCreateOpts build(); @@ -190,11 +169,9 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements ExternalUserIdStage, ProjectIdStage, _FinalStage { + public static final class Builder implements ExternalUserIdStage, _FinalStage { private String externalUserId; - private String projectId; - private Optional webhookUri = Optional.empty(); private Optional successRedirectUri = Optional.empty(); @@ -211,7 +188,6 @@ private Builder() {} @java.lang.Override public Builder from(ConnectTokenCreateOpts other) { externalUserId(other.getExternalUserId()); - projectId(other.getProjectId()); allowedOrigins(other.getAllowedOrigins()); errorRedirectUri(other.getErrorRedirectUri()); successRedirectUri(other.getSuccessRedirectUri()); @@ -226,23 +202,11 @@ public Builder from(ConnectTokenCreateOpts other) { */ @java.lang.Override @JsonSetter("external_user_id") - public ProjectIdStage externalUserId(@NotNull String externalUserId) { + public _FinalStage externalUserId(@NotNull String externalUserId) { this.externalUserId = Objects.requireNonNull(externalUserId, "externalUserId must not be null"); return this; } - /** - *

The ID of the project

- *

The ID of the project

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

Webhook URI for notifications

* @return Reference to {@code this} so that method calls can be chained together. @@ -327,7 +291,6 @@ public _FinalStage allowedOrigins(Optional> allowedOrigins) { public ConnectTokenCreateOpts build() { return new ConnectTokenCreateOpts( externalUserId, - projectId, allowedOrigins, errorRedirectUri, successRedirectUri, diff --git a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/types/ProxyResponse.java b/build/spotless/spotlessJava/src/main/java/com/pipedream/api/types/ProxyResponse.java deleted file mode 100644 index 60a46ab..0000000 --- a/build/spotless/spotlessJava/src/main/java/com/pipedream/api/types/ProxyResponse.java +++ /dev/null @@ -1,155 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.types; - -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSetter; -import com.fasterxml.jackson.annotation.Nulls; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.pipedream.api.core.ObjectMappers; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = ProxyResponse.Builder.class) -public final class ProxyResponse { - private final Optional status; - - private final Optional> headers; - - private final Optional body; - - private final Map additionalProperties; - - private ProxyResponse( - Optional status, - Optional> headers, - Optional body, - Map additionalProperties) { - this.status = status; - this.headers = headers; - this.body = body; - this.additionalProperties = additionalProperties; - } - - /** - * @return HTTP status code - */ - @JsonProperty("status") - public Optional getStatus() { - return status; - } - - /** - * @return Response headers - */ - @JsonProperty("headers") - public Optional> getHeaders() { - return headers; - } - - @JsonProperty("body") - public Optional getBody() { - return body; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof ProxyResponse && equalTo((ProxyResponse) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(ProxyResponse other) { - return status.equals(other.status) && headers.equals(other.headers) && body.equals(other.body); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.status, this.headers, this.body); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static Builder builder() { - return new Builder(); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder { - private Optional status = Optional.empty(); - - private Optional> headers = Optional.empty(); - - private Optional body = Optional.empty(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - public Builder from(ProxyResponse other) { - status(other.getStatus()); - headers(other.getHeaders()); - body(other.getBody()); - return this; - } - - /** - *

HTTP status code

- */ - @JsonSetter(value = "status", nulls = Nulls.SKIP) - public Builder status(Optional status) { - this.status = status; - return this; - } - - public Builder status(Integer status) { - this.status = Optional.ofNullable(status); - return this; - } - - /** - *

Response headers

- */ - @JsonSetter(value = "headers", nulls = Nulls.SKIP) - public Builder headers(Optional> headers) { - this.headers = headers; - return this; - } - - public Builder headers(Map headers) { - this.headers = Optional.ofNullable(headers); - return this; - } - - @JsonSetter(value = "body", nulls = Nulls.SKIP) - public Builder body(Optional body) { - this.body = body; - return this; - } - - public Builder body(Object body) { - this.body = Optional.ofNullable(body); - return this; - } - - public ProxyResponse build() { - return new ProxyResponse(status, headers, body, additionalProperties); - } - } -} diff --git a/reference.md b/reference.md index 4569eb0..65ccf59 100644 --- a/reference.md +++ b/reference.md @@ -315,7 +315,7 @@ client.accounts().list( ```java client.accounts().create( "project_id", - CreateAccountRequest + CreateAccountOpts .builder() .appSlug("app_slug") .cfmapJson("cfmap_json") @@ -2289,7 +2289,7 @@ client.projects().retrieveInfo("project_id"); ## Proxy -
client.proxy.get(projectId, url64) -> Map<String, Object> +
client.proxy.get(projectId, url64) -> Object
@@ -2361,7 +2361,7 @@ client.proxy().get(
-
client.proxy.post(projectId, url64, request) -> Map<String, Object> +
client.proxy.post(projectId, url64, request) -> Object
@@ -2446,7 +2446,7 @@ client.proxy().post(
-
client.proxy.put(projectId, url64, request) -> Map<String, Object> +
client.proxy.put(projectId, url64, request) -> Object
@@ -2531,7 +2531,7 @@ client.proxy().put(
-
client.proxy.delete(projectId, url64) -> Map<String, Object> +
client.proxy.delete(projectId, url64) -> Object
@@ -2603,7 +2603,7 @@ client.proxy().delete(
-
client.proxy.patch(projectId, url64, request) -> Map<String, Object> +
client.proxy.patch(projectId, url64, request) -> Object
@@ -2689,7 +2689,7 @@ client.proxy().patch(
## Tokens -
client.tokens.create(request) -> CreateTokenResponse +
client.tokens.create(projectId, request) -> CreateTokenResponse
@@ -2703,10 +2703,10 @@ client.proxy().patch( ```java client.tokens().create( - CreateTokenRequest + "project_id", + CreateTokenOpts .builder() .externalUserId("external_user_id") - .projectId("project_id") .build() ); ``` @@ -2723,7 +2723,7 @@ client.tokens().create(
-**allowedOrigins:** `Optional>` — List of allowed origins for CORS +**projectId:** `String` — The project ID, which starts with 'proj_'.
@@ -2731,7 +2731,7 @@ client.tokens().create(
-**errorRedirectUri:** `Optional` — URI to redirect to on error +**allowedOrigins:** `Optional>` — List of allowed origins for CORS
@@ -2739,7 +2739,7 @@ client.tokens().create(
-**externalUserId:** `String` — Your end user ID, for whom you're creating the token +**errorRedirectUri:** `Optional` — URI to redirect to on error
@@ -2747,7 +2747,7 @@ client.tokens().create(
-**projectId:** `String` — The ID of the project +**externalUserId:** `String` — Your end user ID, for whom you're creating the token
@@ -2775,7 +2775,7 @@ client.tokens().create(
-
client.tokens.validate(ctok) -> ValidateTokenResponse +
client.tokens.validate(projectId, ctok) -> ValidateTokenResponse
@@ -2789,6 +2789,7 @@ client.tokens().create( ```java client.tokens().validate( + "project_id", "ctok", TokensValidateRequest .builder() @@ -2808,6 +2809,14 @@ client.tokens().validate(
+**projectId:** `String` — The project ID, which starts with 'proj_'. + +
+
+ +
+
+ **ctok:** `String`
diff --git a/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java b/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java index e6b8839..9361d1d 100644 --- a/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java +++ b/src/main/java/com/pipedream/api/AsyncBaseClientBuilder.java @@ -7,10 +7,13 @@ import com.pipedream.api.core.Environment; import com.pipedream.api.core.OAuthTokenSupplier; import com.pipedream.api.resources.oauthtokens.OauthTokensClient; +import java.util.Optional; import okhttp3.OkHttpClient; public class AsyncBaseClientBuilder { - private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); + private Optional timeout = Optional.empty(); + + private Optional maxRetries = Optional.empty(); private String clientId = System.getenv("PIPEDREAM_CLIENT_ID"); @@ -20,6 +23,8 @@ public class AsyncBaseClientBuilder { private Environment environment = Environment.PROD; + private OkHttpClient httpClient; + /** * Sets clientId. * Defaults to the PIPEDREAM_CLIENT_ID environment variable. @@ -60,7 +65,7 @@ public AsyncBaseClientBuilder url(String url) { * Sets the timeout (in seconds) for the client. Defaults to 60 seconds. */ public AsyncBaseClientBuilder timeout(int timeout) { - this.clientOptionsBuilder.timeout(timeout); + this.timeout = Optional.of(timeout); return this; } @@ -68,7 +73,7 @@ public AsyncBaseClientBuilder timeout(int timeout) { * Sets the maximum number of retries for the client. Defaults to 2 retries. */ public AsyncBaseClientBuilder maxRetries(int maxRetries) { - this.clientOptionsBuilder.maxRetries(maxRetries); + this.maxRetries = Optional.of(maxRetries); return this; } @@ -76,7 +81,7 @@ public AsyncBaseClientBuilder maxRetries(int maxRetries) { * Sets the underlying OkHttp client */ public AsyncBaseClientBuilder httpClient(OkHttpClient httpClient) { - this.clientOptionsBuilder.httpClient(httpClient); + this.httpClient = httpClient; return this; } @@ -86,18 +91,156 @@ public AsyncBaseClientBuilder projectId(String projectId) { } protected ClientOptions buildClientOptions() { - clientOptionsBuilder.environment(this.environment); - return clientOptionsBuilder.build(); + ClientOptions.Builder builder = ClientOptions.builder(); + setEnvironment(builder); + setAuthentication(builder); + setCustomHeaders(builder); + setVariables(builder); + setHttpClient(builder); + setTimeouts(builder); + setRetries(builder); + setAdditional(builder); + return builder.build(); } - public AsyncBaseClient build() { - OauthTokensClient authClient = new OauthTokensClient( - ClientOptions.builder().environment(this.environment).build()); - OAuthTokenSupplier oAuthTokenSupplier = new OAuthTokenSupplier(clientId, clientSecret, authClient); - this.clientOptionsBuilder.addHeader("Authorization", oAuthTokenSupplier); - if (projectEnvironment != null) { - this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment); + /** + * Sets the environment configuration for the client. + * Override this method to modify URLs or add environment-specific logic. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setEnvironment(ClientOptions.Builder builder) { + builder.environment(this.environment); + } + + /** + * Override this method to customize authentication. + * This method is called during client options construction to set up authentication headers. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAuthentication(ClientOptions.Builder builder) {
+     *     super.setAuthentication(builder); // Keep existing auth
+     *     builder.addHeader("X-API-Key", this.apiKey);
+     * }
+     * }
+ */ + protected void setAuthentication(ClientOptions.Builder builder) { + if (this.clientId != null && this.clientSecret != null) { + OauthTokensClient authClient = new OauthTokensClient( + ClientOptions.builder().environment(this.environment).build()); + OAuthTokenSupplier oAuthTokenSupplier = + new OAuthTokenSupplier(this.clientId, this.clientSecret, authClient); + builder.addHeader("Authorization", oAuthTokenSupplier); } + } + + /** + * Override this method to add or modify custom headers. + * This method is called during client options construction to set up custom headers defined in the API. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setCustomHeaders(ClientOptions.Builder builder) {
+     *     super.setCustomHeaders(builder); // Keep existing headers
+     *     builder.addHeader("X-Trace-ID", generateTraceId());
+     * }
+     * }
+ */ + protected void setCustomHeaders(ClientOptions.Builder builder) { + if (this.projectEnvironment != null) { + builder.addHeader("x-pd-environment", this.projectEnvironment); + } + } + + /** + * Override this method to configure API variables defined in the specification. + * Available variables: projectId + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setVariables(ClientOptions.Builder builder) {} + + /** + * Sets the request timeout configuration. + * Override this method to customize timeout behavior. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setTimeouts(ClientOptions.Builder builder) { + if (this.timeout.isPresent()) { + builder.timeout(this.timeout.get()); + } + } + + /** + * Sets the retry configuration for failed requests. + * Override this method to implement custom retry strategies. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setRetries(ClientOptions.Builder builder) { + if (this.maxRetries.isPresent()) { + builder.maxRetries(this.maxRetries.get()); + } + } + + /** + * Sets the OkHttp client configuration. + * Override this method to customize HTTP client behavior (interceptors, connection pools, etc). + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setHttpClient(ClientOptions.Builder builder) { + if (this.httpClient != null) { + builder.httpClient(this.httpClient); + } + } + + /** + * Override this method to add any additional configuration to the client. + * This method is called at the end of the configuration chain, allowing you to add + * custom headers, modify settings, or perform any other client customization. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAdditional(ClientOptions.Builder builder) {
+     *     builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
+     *     builder.addHeader("X-Client-Version", "1.0.0");
+     * }
+     * }
+ */ + protected void setAdditional(ClientOptions.Builder builder) {} + + /** + * Override this method to add custom validation logic before the client is built. + * This method is called at the beginning of the build() method to ensure the configuration is valid. + * Throw an exception to prevent client creation if validation fails. + * + * Example: + * 
{@code
+     * @Override
+     * protected void validateConfiguration() {
+     *     super.validateConfiguration(); // Run parent validations
+     *     if (tenantId == null || tenantId.isEmpty()) {
+     *         throw new IllegalStateException("tenantId is required");
+     *     }
+     * }
+     * }
+ */ + protected void validateConfiguration() {} + + public AsyncBaseClient build() { + validateConfiguration(); return new AsyncBaseClient(buildClientOptions()); } } diff --git a/src/main/java/com/pipedream/api/BaseClientBuilder.java b/src/main/java/com/pipedream/api/BaseClientBuilder.java index 000caa1..13318cd 100644 --- a/src/main/java/com/pipedream/api/BaseClientBuilder.java +++ b/src/main/java/com/pipedream/api/BaseClientBuilder.java @@ -7,10 +7,13 @@ import com.pipedream.api.core.Environment; import com.pipedream.api.core.OAuthTokenSupplier; import com.pipedream.api.resources.oauthtokens.OauthTokensClient; +import java.util.Optional; import okhttp3.OkHttpClient; public class BaseClientBuilder { - private ClientOptions.Builder clientOptionsBuilder = ClientOptions.builder(); + private Optional timeout = Optional.empty(); + + private Optional maxRetries = Optional.empty(); private String clientId = System.getenv("PIPEDREAM_CLIENT_ID"); @@ -20,6 +23,8 @@ public class BaseClientBuilder { private Environment environment = Environment.PROD; + private OkHttpClient httpClient; + /** * Sets clientId. * Defaults to the PIPEDREAM_CLIENT_ID environment variable. @@ -60,7 +65,7 @@ public BaseClientBuilder url(String url) { * Sets the timeout (in seconds) for the client. Defaults to 60 seconds. */ public BaseClientBuilder timeout(int timeout) { - this.clientOptionsBuilder.timeout(timeout); + this.timeout = Optional.of(timeout); return this; } @@ -68,7 +73,7 @@ public BaseClientBuilder timeout(int timeout) { * Sets the maximum number of retries for the client. Defaults to 2 retries. */ public BaseClientBuilder maxRetries(int maxRetries) { - this.clientOptionsBuilder.maxRetries(maxRetries); + this.maxRetries = Optional.of(maxRetries); return this; } @@ -76,7 +81,7 @@ public BaseClientBuilder maxRetries(int maxRetries) { * Sets the underlying OkHttp client */ public BaseClientBuilder httpClient(OkHttpClient httpClient) { - this.clientOptionsBuilder.httpClient(httpClient); + this.httpClient = httpClient; return this; } @@ -86,18 +91,156 @@ public BaseClientBuilder projectId(String projectId) { } protected ClientOptions buildClientOptions() { - clientOptionsBuilder.environment(this.environment); - return clientOptionsBuilder.build(); + ClientOptions.Builder builder = ClientOptions.builder(); + setEnvironment(builder); + setAuthentication(builder); + setCustomHeaders(builder); + setVariables(builder); + setHttpClient(builder); + setTimeouts(builder); + setRetries(builder); + setAdditional(builder); + return builder.build(); } - public BaseClient build() { - OauthTokensClient authClient = new OauthTokensClient( - ClientOptions.builder().environment(this.environment).build()); - OAuthTokenSupplier oAuthTokenSupplier = new OAuthTokenSupplier(clientId, clientSecret, authClient); - this.clientOptionsBuilder.addHeader("Authorization", oAuthTokenSupplier); - if (projectEnvironment != null) { - this.clientOptionsBuilder.addHeader("x-pd-environment", this.projectEnvironment); + /** + * Sets the environment configuration for the client. + * Override this method to modify URLs or add environment-specific logic. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setEnvironment(ClientOptions.Builder builder) { + builder.environment(this.environment); + } + + /** + * Override this method to customize authentication. + * This method is called during client options construction to set up authentication headers. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAuthentication(ClientOptions.Builder builder) {
+     *     super.setAuthentication(builder); // Keep existing auth
+     *     builder.addHeader("X-API-Key", this.apiKey);
+     * }
+     * }
+ */ + protected void setAuthentication(ClientOptions.Builder builder) { + if (this.clientId != null && this.clientSecret != null) { + OauthTokensClient authClient = new OauthTokensClient( + ClientOptions.builder().environment(this.environment).build()); + OAuthTokenSupplier oAuthTokenSupplier = + new OAuthTokenSupplier(this.clientId, this.clientSecret, authClient); + builder.addHeader("Authorization", oAuthTokenSupplier); } + } + + /** + * Override this method to add or modify custom headers. + * This method is called during client options construction to set up custom headers defined in the API. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setCustomHeaders(ClientOptions.Builder builder) {
+     *     super.setCustomHeaders(builder); // Keep existing headers
+     *     builder.addHeader("X-Trace-ID", generateTraceId());
+     * }
+     * }
+ */ + protected void setCustomHeaders(ClientOptions.Builder builder) { + if (this.projectEnvironment != null) { + builder.addHeader("x-pd-environment", this.projectEnvironment); + } + } + + /** + * Override this method to configure API variables defined in the specification. + * Available variables: projectId + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setVariables(ClientOptions.Builder builder) {} + + /** + * Sets the request timeout configuration. + * Override this method to customize timeout behavior. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setTimeouts(ClientOptions.Builder builder) { + if (this.timeout.isPresent()) { + builder.timeout(this.timeout.get()); + } + } + + /** + * Sets the retry configuration for failed requests. + * Override this method to implement custom retry strategies. + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setRetries(ClientOptions.Builder builder) { + if (this.maxRetries.isPresent()) { + builder.maxRetries(this.maxRetries.get()); + } + } + + /** + * Sets the OkHttp client configuration. + * Override this method to customize HTTP client behavior (interceptors, connection pools, etc). + * + * @param builder The ClientOptions.Builder to configure + */ + protected void setHttpClient(ClientOptions.Builder builder) { + if (this.httpClient != null) { + builder.httpClient(this.httpClient); + } + } + + /** + * Override this method to add any additional configuration to the client. + * This method is called at the end of the configuration chain, allowing you to add + * custom headers, modify settings, or perform any other client customization. + * + * @param builder The ClientOptions.Builder to configure + * + * Example: + * 
{@code
+     * @Override
+     * protected void setAdditional(ClientOptions.Builder builder) {
+     *     builder.addHeader("X-Request-ID", () -> UUID.randomUUID().toString());
+     *     builder.addHeader("X-Client-Version", "1.0.0");
+     * }
+     * }
+ */ + protected void setAdditional(ClientOptions.Builder builder) {} + + /** + * Override this method to add custom validation logic before the client is built. + * This method is called at the beginning of the build() method to ensure the configuration is valid. + * Throw an exception to prevent client creation if validation fails. + * + * Example: + * 
{@code
+     * @Override
+     * protected void validateConfiguration() {
+     *     super.validateConfiguration(); // Run parent validations
+     *     if (tenantId == null || tenantId.isEmpty()) {
+     *         throw new IllegalStateException("tenantId is required");
+     *     }
+     * }
+     * }
+ */ + protected void validateConfiguration() {} + + public BaseClient build() { + validateConfiguration(); return new BaseClient(buildClientOptions()); } } diff --git a/src/main/java/com/pipedream/api/core/ClientOptions.java b/src/main/java/com/pipedream/api/core/ClientOptions.java index 524ee4e..bd94c5e 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.237"); + put("X-Fern-SDK-Version", "0.0.255"); } }); this.headerSuppliers = headerSuppliers; diff --git a/src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java b/src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java index 81f9441..4e8b110 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java +++ b/src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java @@ -8,7 +8,7 @@ import com.pipedream.api.core.pagination.SyncPagingIterable; import com.pipedream.api.resources.accounts.requests.AccountsListRequest; import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; import com.pipedream.api.types.Account; public class AccountsClient { @@ -40,11 +40,11 @@ public SyncPagingIterable list(AccountsListRequest request, RequestOpti return this.rawClient.list(request, requestOptions).body(); } - public Account create(CreateAccountRequest request) { + public Account create(CreateAccountOpts request) { return this.rawClient.create(request).body(); } - public Account create(CreateAccountRequest request, RequestOptions requestOptions) { + public Account create(CreateAccountOpts request, RequestOptions requestOptions) { return this.rawClient.create(request, requestOptions).body(); } diff --git a/src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java b/src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java index 761a206..34158ac 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java +++ b/src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java @@ -8,7 +8,7 @@ import com.pipedream.api.core.pagination.SyncPagingIterable; import com.pipedream.api.resources.accounts.requests.AccountsListRequest; import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; import com.pipedream.api.types.Account; import java.util.concurrent.CompletableFuture; @@ -42,11 +42,11 @@ public CompletableFuture> list( return this.rawClient.list(request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture create(CreateAccountRequest request) { + public CompletableFuture create(CreateAccountOpts request) { return this.rawClient.create(request).thenApply(response -> response.body()); } - public CompletableFuture create(CreateAccountRequest request, RequestOptions requestOptions) { + public CompletableFuture create(CreateAccountOpts request, RequestOptions requestOptions) { return this.rawClient.create(request, requestOptions).thenApply(response -> response.body()); } 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 59601c1..ea4f83a 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java +++ b/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java @@ -14,7 +14,7 @@ import com.pipedream.api.core.pagination.SyncPagingIterable; import com.pipedream.api.resources.accounts.requests.AccountsListRequest; import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; import com.pipedream.api.types.Account; import com.pipedream.api.types.ListAccountsResponse; import java.io.IOException; @@ -146,12 +146,12 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { return future; } - public CompletableFuture> create(CreateAccountRequest request) { + public CompletableFuture> create(CreateAccountOpts request) { return create(request, null); } public CompletableFuture> create( - CreateAccountRequest request, RequestOptions requestOptions) { + CreateAccountOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") 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 e90fe31..5fb30da 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java +++ b/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java @@ -14,7 +14,7 @@ import com.pipedream.api.core.pagination.SyncPagingIterable; import com.pipedream.api.resources.accounts.requests.AccountsListRequest; import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest; -import com.pipedream.api.resources.accounts.requests.CreateAccountRequest; +import com.pipedream.api.resources.accounts.requests.CreateAccountOpts; import com.pipedream.api.types.Account; import com.pipedream.api.types.ListAccountsResponse; import java.io.IOException; @@ -121,11 +121,11 @@ public BaseClientHttpResponse> list( } } - public BaseClientHttpResponse create(CreateAccountRequest request) { + public BaseClientHttpResponse create(CreateAccountOpts request) { return create(request, null); } - public BaseClientHttpResponse create(CreateAccountRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse create(CreateAccountOpts request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") diff --git a/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java b/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountOpts.java similarity index 95% rename from src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java rename to src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountOpts.java index aeec52a..79cef5e 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountRequest.java +++ b/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountOpts.java @@ -19,8 +19,8 @@ import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = CreateAccountRequest.Builder.class) -public final class CreateAccountRequest { +@JsonDeserialize(builder = CreateAccountOpts.Builder.class) +public final class CreateAccountOpts { private final Optional appId; private final Optional externalUserId; @@ -37,7 +37,7 @@ public final class CreateAccountRequest { private final Map additionalProperties; - private CreateAccountRequest( + private CreateAccountOpts( Optional appId, Optional externalUserId, Optional oauthAppId, @@ -112,7 +112,7 @@ public Optional getName() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof CreateAccountRequest && equalTo((CreateAccountRequest) other); + return other instanceof CreateAccountOpts && equalTo((CreateAccountOpts) other); } @JsonAnyGetter @@ -120,7 +120,7 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(CreateAccountRequest other) { + private boolean equalTo(CreateAccountOpts other) { return appId.equals(other.appId) && externalUserId.equals(other.externalUserId) && oauthAppId.equals(other.oauthAppId) @@ -157,7 +157,7 @@ public interface AppSlugStage { */ CfmapJsonStage appSlug(@NotNull String appSlug); - Builder from(CreateAccountRequest other); + Builder from(CreateAccountOpts other); } public interface CfmapJsonStage { @@ -175,7 +175,7 @@ public interface ConnectTokenStage { } public interface _FinalStage { - CreateAccountRequest build(); + CreateAccountOpts build(); /** *

The app slug or ID to filter accounts by.

@@ -225,7 +225,7 @@ public static final class Builder implements AppSlugStage, CfmapJsonStage, Conne private Builder() {} @java.lang.Override - public Builder from(CreateAccountRequest other) { + public Builder from(CreateAccountOpts other) { appId(other.getAppId()); externalUserId(other.getExternalUserId()); oauthAppId(other.getOauthAppId()); @@ -346,8 +346,8 @@ public _FinalStage appId(Optional appId) { } @java.lang.Override - public CreateAccountRequest build() { - return new CreateAccountRequest( + public CreateAccountOpts build() { + return new CreateAccountOpts( appId, externalUserId, oauthAppId, appSlug, cfmapJson, connectToken, name, additionalProperties); } } diff --git a/src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java b/src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java index 61bcd21..fd06a93 100644 --- a/src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java +++ b/src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java @@ -10,7 +10,6 @@ import com.pipedream.api.resources.proxy.requests.ProxyPatchRequest; import com.pipedream.api.resources.proxy.requests.ProxyPostRequest; import com.pipedream.api.resources.proxy.requests.ProxyPutRequest; -import java.util.Map; import java.util.concurrent.CompletableFuture; public class AsyncProxyClient { @@ -30,48 +29,43 @@ public AsyncRawProxyClient withRawResponse() { return this.rawClient; } - public CompletableFuture> get(String url64, ProxyGetRequest request) { + public CompletableFuture get(String url64, ProxyGetRequest request) { return this.rawClient.get(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> get( - String url64, ProxyGetRequest request, RequestOptions requestOptions) { + public CompletableFuture get(String url64, ProxyGetRequest request, RequestOptions requestOptions) { return this.rawClient.get(url64, request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture> post(String url64, ProxyPostRequest request) { + public CompletableFuture post(String url64, ProxyPostRequest request) { return this.rawClient.post(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> post( - String url64, ProxyPostRequest request, RequestOptions requestOptions) { + public CompletableFuture post(String url64, ProxyPostRequest request, RequestOptions requestOptions) { return this.rawClient.post(url64, request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture> put(String url64, ProxyPutRequest request) { + public CompletableFuture put(String url64, ProxyPutRequest request) { return this.rawClient.put(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> put( - String url64, ProxyPutRequest request, RequestOptions requestOptions) { + public CompletableFuture put(String url64, ProxyPutRequest request, RequestOptions requestOptions) { return this.rawClient.put(url64, request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture> delete(String url64, ProxyDeleteRequest request) { + public CompletableFuture delete(String url64, ProxyDeleteRequest request) { return this.rawClient.delete(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> delete( - String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { + public CompletableFuture delete(String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { return this.rawClient.delete(url64, request, requestOptions).thenApply(response -> response.body()); } - public CompletableFuture> patch(String url64, ProxyPatchRequest request) { + public CompletableFuture patch(String url64, ProxyPatchRequest request) { return this.rawClient.patch(url64, request).thenApply(response -> response.body()); } - public CompletableFuture> patch( - String url64, ProxyPatchRequest request, RequestOptions requestOptions) { + public CompletableFuture patch(String url64, ProxyPatchRequest request, RequestOptions requestOptions) { return this.rawClient.patch(url64, request, requestOptions).thenApply(response -> response.body()); } } 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 30ca813..24f27f3 100644 --- a/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java +++ b/src/main/java/com/pipedream/api/resources/proxy/AsyncRawProxyClient.java @@ -3,7 +3,6 @@ */ package com.pipedream.api.resources.proxy; -import com.fasterxml.jackson.core.type.TypeReference; import com.pipedream.api.core.BaseClientApiException; import com.pipedream.api.core.BaseClientException; import com.pipedream.api.core.BaseClientHttpResponse; @@ -18,7 +17,6 @@ import com.pipedream.api.resources.proxy.requests.ProxyPostRequest; import com.pipedream.api.resources.proxy.requests.ProxyPutRequest; import java.io.IOException; -import java.util.Map; import java.util.concurrent.CompletableFuture; import okhttp3.Call; import okhttp3.Callback; @@ -38,11 +36,11 @@ 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,16 +60,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; @@ -94,11 +90,11 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { return future; } - public CompletableFuture>> post(String url64, ProxyPostRequest request) { + 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() @@ -126,16 +122,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; @@ -158,11 +152,11 @@ public void onFailure(@NotNull Call call, @NotNull IOException 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() @@ -190,16 +184,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; @@ -222,12 +214,11 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { return future; } - public CompletableFuture>> delete( - String url64, ProxyDeleteRequest request) { + 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() @@ -247,16 +238,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; @@ -279,12 +268,11 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) { return future; } - public CompletableFuture>> patch( - String url64, ProxyPatchRequest request) { + 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() @@ -312,16 +300,14 @@ 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 BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response)); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response)); return; } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; diff --git a/src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java b/src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java index aa27dba..a7e22d7 100644 --- a/src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java +++ b/src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java @@ -10,7 +10,6 @@ import com.pipedream.api.resources.proxy.requests.ProxyPatchRequest; import com.pipedream.api.resources.proxy.requests.ProxyPostRequest; import com.pipedream.api.resources.proxy.requests.ProxyPutRequest; -import java.util.Map; public class ProxyClient { protected final ClientOptions clientOptions; @@ -29,43 +28,43 @@ public RawProxyClient withRawResponse() { return this.rawClient; } - public Map get(String url64, ProxyGetRequest request) { + public Object get(String url64, ProxyGetRequest request) { return this.rawClient.get(url64, request).body(); } - public Map get(String url64, ProxyGetRequest request, RequestOptions requestOptions) { + public Object get(String url64, ProxyGetRequest request, RequestOptions requestOptions) { return this.rawClient.get(url64, request, requestOptions).body(); } - public Map post(String url64, ProxyPostRequest request) { + public Object post(String url64, ProxyPostRequest request) { return this.rawClient.post(url64, request).body(); } - public Map post(String url64, ProxyPostRequest request, RequestOptions requestOptions) { + public Object post(String url64, ProxyPostRequest request, RequestOptions requestOptions) { return this.rawClient.post(url64, request, requestOptions).body(); } - public Map put(String url64, ProxyPutRequest request) { + public Object put(String url64, ProxyPutRequest request) { return this.rawClient.put(url64, request).body(); } - public Map put(String url64, ProxyPutRequest request, RequestOptions requestOptions) { + public Object put(String url64, ProxyPutRequest request, RequestOptions requestOptions) { return this.rawClient.put(url64, request, requestOptions).body(); } - public Map delete(String url64, ProxyDeleteRequest request) { + public Object delete(String url64, ProxyDeleteRequest request) { return this.rawClient.delete(url64, request).body(); } - public Map delete(String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { + public Object delete(String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { return this.rawClient.delete(url64, request, requestOptions).body(); } - public Map patch(String url64, ProxyPatchRequest request) { + public Object patch(String url64, ProxyPatchRequest request) { return this.rawClient.patch(url64, request).body(); } - public Map patch(String url64, ProxyPatchRequest request, RequestOptions requestOptions) { + public Object patch(String url64, ProxyPatchRequest request, RequestOptions requestOptions) { return this.rawClient.patch(url64, request, requestOptions).body(); } } 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 fb9c5bf..8bfb9ec 100644 --- a/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java +++ b/src/main/java/com/pipedream/api/resources/proxy/RawProxyClient.java @@ -3,7 +3,6 @@ */ package com.pipedream.api.resources.proxy; -import com.fasterxml.jackson.core.type.TypeReference; import com.pipedream.api.core.BaseClientApiException; import com.pipedream.api.core.BaseClientException; import com.pipedream.api.core.BaseClientHttpResponse; @@ -18,7 +17,6 @@ import com.pipedream.api.resources.proxy.requests.ProxyPostRequest; import com.pipedream.api.resources.proxy.requests.ProxyPutRequest; import java.io.IOException; -import java.util.Map; import okhttp3.Headers; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -34,12 +32,11 @@ public RawProxyClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public BaseClientHttpResponse> get(String url64, ProxyGetRequest request) { + public BaseClientHttpResponse get(String url64, ProxyGetRequest request) { return get(url64, request, null); } - public BaseClientHttpResponse> get( - String url64, ProxyGetRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse get(String url64, ProxyGetRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -62,9 +59,7 @@ public BaseClientHttpResponse> get( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( @@ -77,12 +72,11 @@ public BaseClientHttpResponse> get( } } - public BaseClientHttpResponse> post(String url64, ProxyPostRequest request) { + public BaseClientHttpResponse post(String url64, ProxyPostRequest request) { return post(url64, request, null); } - public BaseClientHttpResponse> post( - String url64, ProxyPostRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse post(String url64, ProxyPostRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -113,9 +107,7 @@ public BaseClientHttpResponse> post( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( @@ -128,12 +120,11 @@ public BaseClientHttpResponse> post( } } - public BaseClientHttpResponse> put(String url64, ProxyPutRequest request) { + public BaseClientHttpResponse put(String url64, ProxyPutRequest request) { return put(url64, request, null); } - public BaseClientHttpResponse> put( - String url64, ProxyPutRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse put(String url64, ProxyPutRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() .addPathSegments("v1/connect") @@ -164,9 +155,7 @@ public BaseClientHttpResponse> put( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( @@ -179,11 +168,11 @@ public BaseClientHttpResponse> put( } } - public BaseClientHttpResponse> delete(String url64, ProxyDeleteRequest request) { + public BaseClientHttpResponse delete(String url64, ProxyDeleteRequest request) { return delete(url64, request, null); } - public BaseClientHttpResponse> delete( + public BaseClientHttpResponse delete( String url64, ProxyDeleteRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -207,9 +196,7 @@ public BaseClientHttpResponse> delete( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( @@ -222,11 +209,11 @@ public BaseClientHttpResponse> delete( } } - public BaseClientHttpResponse> patch(String url64, ProxyPatchRequest request) { + public BaseClientHttpResponse patch(String url64, ProxyPatchRequest request) { return patch(url64, request, null); } - public BaseClientHttpResponse> patch( + public BaseClientHttpResponse patch( String url64, ProxyPatchRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() @@ -258,9 +245,7 @@ public BaseClientHttpResponse> patch( ResponseBody responseBody = response.body(); if (response.isSuccessful()) { return new BaseClientHttpResponse<>( - ObjectMappers.JSON_MAPPER.readValue( - responseBody.string(), new TypeReference>() {}), - response); + ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), Object.class), response); } String responseBodyString = responseBody != null ? responseBody.string() : "{}"; throw new BaseClientApiException( 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 84570a9..e6f7c8c 100644 --- a/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java +++ b/src/main/java/com/pipedream/api/resources/tokens/AsyncRawTokensClient.java @@ -12,7 +12,7 @@ import com.pipedream.api.core.ObjectMappers; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; -import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; +import com.pipedream.api.resources.tokens.requests.CreateTokenOpts; import com.pipedream.api.resources.tokens.requests.TokensValidateRequest; import com.pipedream.api.types.CreateTokenResponse; import com.pipedream.api.types.ValidateTokenResponse; @@ -36,15 +36,17 @@ public AsyncRawTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public CompletableFuture> create(CreateTokenRequest request) { + public CompletableFuture> create(CreateTokenOpts request) { return create(request, null); } public CompletableFuture> create( - CreateTokenRequest request, RequestOptions requestOptions) { + CreateTokenOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() - .addPathSegments("v1/connect/tokens") + .addPathSegments("v1/connect") + .addPathSegment(clientOptions.projectId()) + .addPathSegments("tokens") .build(); RequestBody body; try { @@ -108,7 +110,9 @@ public CompletableFuture> validate String ctok, TokensValidateRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() - .addPathSegments("v1/connect/tokens") + .addPathSegments("v1/connect") + .addPathSegment(clientOptions.projectId()) + .addPathSegments("tokens") .addPathSegment(ctok) .addPathSegments("validate"); if (request.getParams().isPresent()) { diff --git a/src/main/java/com/pipedream/api/resources/tokens/AsyncTokensClient.java b/src/main/java/com/pipedream/api/resources/tokens/AsyncTokensClient.java index eef98a0..e918132 100644 --- a/src/main/java/com/pipedream/api/resources/tokens/AsyncTokensClient.java +++ b/src/main/java/com/pipedream/api/resources/tokens/AsyncTokensClient.java @@ -5,7 +5,7 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.RequestOptions; -import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; +import com.pipedream.api.resources.tokens.requests.CreateTokenOpts; import com.pipedream.api.resources.tokens.requests.TokensValidateRequest; import com.pipedream.api.types.CreateTokenResponse; import com.pipedream.api.types.ValidateTokenResponse; @@ -28,11 +28,11 @@ public AsyncRawTokensClient withRawResponse() { return this.rawClient; } - public CompletableFuture create(CreateTokenRequest request) { + public CompletableFuture create(CreateTokenOpts request) { return this.rawClient.create(request).thenApply(response -> response.body()); } - public CompletableFuture create(CreateTokenRequest request, RequestOptions requestOptions) { + public CompletableFuture create(CreateTokenOpts request, RequestOptions requestOptions) { return this.rawClient.create(request, requestOptions).thenApply(response -> response.body()); } 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 b18022c..7b0a9de 100644 --- a/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java +++ b/src/main/java/com/pipedream/api/resources/tokens/RawTokensClient.java @@ -12,7 +12,7 @@ import com.pipedream.api.core.ObjectMappers; import com.pipedream.api.core.QueryStringMapper; import com.pipedream.api.core.RequestOptions; -import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; +import com.pipedream.api.resources.tokens.requests.CreateTokenOpts; import com.pipedream.api.resources.tokens.requests.TokensValidateRequest; import com.pipedream.api.types.CreateTokenResponse; import com.pipedream.api.types.ValidateTokenResponse; @@ -32,15 +32,16 @@ public RawTokensClient(ClientOptions clientOptions) { this.clientOptions = clientOptions; } - public BaseClientHttpResponse create(CreateTokenRequest request) { + public BaseClientHttpResponse create(CreateTokenOpts request) { return create(request, null); } - public BaseClientHttpResponse create( - CreateTokenRequest request, RequestOptions requestOptions) { + public BaseClientHttpResponse create(CreateTokenOpts request, RequestOptions requestOptions) { HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() - .addPathSegments("v1/connect/tokens") + .addPathSegments("v1/connect") + .addPathSegment(clientOptions.projectId()) + .addPathSegments("tokens") .build(); RequestBody body; try { @@ -90,7 +91,9 @@ public BaseClientHttpResponse validate( String ctok, TokensValidateRequest request, RequestOptions requestOptions) { HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl()) .newBuilder() - .addPathSegments("v1/connect/tokens") + .addPathSegments("v1/connect") + .addPathSegment(clientOptions.projectId()) + .addPathSegments("tokens") .addPathSegment(ctok) .addPathSegments("validate"); if (request.getParams().isPresent()) { diff --git a/src/main/java/com/pipedream/api/resources/tokens/TokensClient.java b/src/main/java/com/pipedream/api/resources/tokens/TokensClient.java index 98801f4..39c90ad 100644 --- a/src/main/java/com/pipedream/api/resources/tokens/TokensClient.java +++ b/src/main/java/com/pipedream/api/resources/tokens/TokensClient.java @@ -5,7 +5,7 @@ import com.pipedream.api.core.ClientOptions; import com.pipedream.api.core.RequestOptions; -import com.pipedream.api.resources.tokens.requests.CreateTokenRequest; +import com.pipedream.api.resources.tokens.requests.CreateTokenOpts; import com.pipedream.api.resources.tokens.requests.TokensValidateRequest; import com.pipedream.api.types.CreateTokenResponse; import com.pipedream.api.types.ValidateTokenResponse; @@ -27,11 +27,11 @@ public RawTokensClient withRawResponse() { return this.rawClient; } - public CreateTokenResponse create(CreateTokenRequest request) { + public CreateTokenResponse create(CreateTokenOpts request) { return this.rawClient.create(request).body(); } - public CreateTokenResponse create(CreateTokenRequest request, RequestOptions requestOptions) { + public CreateTokenResponse create(CreateTokenOpts request, RequestOptions requestOptions) { return this.rawClient.create(request, requestOptions).body(); } diff --git a/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenRequest.java b/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenOpts.java similarity index 83% rename from src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenRequest.java rename to src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenOpts.java index 9ec9c19..c781251 100644 --- a/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenRequest.java +++ b/src/main/java/com/pipedream/api/resources/tokens/requests/CreateTokenOpts.java @@ -20,34 +20,30 @@ import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = CreateTokenRequest.Builder.class) -public final class CreateTokenRequest { +@JsonDeserialize(builder = CreateTokenOpts.Builder.class) +public final class CreateTokenOpts { private final Optional> allowedOrigins; private final Optional errorRedirectUri; private final String externalUserId; - private final String projectId; - private final Optional successRedirectUri; private final Optional webhookUri; private final Map additionalProperties; - private CreateTokenRequest( + private CreateTokenOpts( Optional> allowedOrigins, Optional errorRedirectUri, String externalUserId, - String projectId, Optional successRedirectUri, Optional webhookUri, Map additionalProperties) { this.allowedOrigins = allowedOrigins; this.errorRedirectUri = errorRedirectUri; this.externalUserId = externalUserId; - this.projectId = projectId; this.successRedirectUri = successRedirectUri; this.webhookUri = webhookUri; this.additionalProperties = additionalProperties; @@ -77,14 +73,6 @@ public String getExternalUserId() { return externalUserId; } - /** - * @return The ID of the project - */ - @JsonProperty("project_id") - public String getProjectId() { - return projectId; - } - /** * @return URI to redirect to on success */ @@ -104,7 +92,7 @@ public Optional getWebhookUri() { @java.lang.Override public boolean equals(Object other) { if (this == other) return true; - return other instanceof CreateTokenRequest && equalTo((CreateTokenRequest) other); + return other instanceof CreateTokenOpts && equalTo((CreateTokenOpts) other); } @JsonAnyGetter @@ -112,11 +100,10 @@ public Map getAdditionalProperties() { return this.additionalProperties; } - private boolean equalTo(CreateTokenRequest other) { + private boolean equalTo(CreateTokenOpts other) { return allowedOrigins.equals(other.allowedOrigins) && errorRedirectUri.equals(other.errorRedirectUri) && externalUserId.equals(other.externalUserId) - && projectId.equals(other.projectId) && successRedirectUri.equals(other.successRedirectUri) && webhookUri.equals(other.webhookUri); } @@ -127,7 +114,6 @@ public int hashCode() { this.allowedOrigins, this.errorRedirectUri, this.externalUserId, - this.projectId, this.successRedirectUri, this.webhookUri); } @@ -145,20 +131,13 @@ public interface ExternalUserIdStage { /** *

Your end user ID, for whom you're creating the token

*/ - ProjectIdStage externalUserId(@NotNull String externalUserId); + _FinalStage externalUserId(@NotNull String externalUserId); - Builder from(CreateTokenRequest other); - } - - public interface ProjectIdStage { - /** - *

The ID of the project

- */ - _FinalStage projectId(@NotNull String projectId); + Builder from(CreateTokenOpts other); } public interface _FinalStage { - CreateTokenRequest build(); + CreateTokenOpts build(); /** *

List of allowed origins for CORS

@@ -190,11 +169,9 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements ExternalUserIdStage, ProjectIdStage, _FinalStage { + public static final class Builder implements ExternalUserIdStage, _FinalStage { private String externalUserId; - private String projectId; - private Optional webhookUri = Optional.empty(); private Optional successRedirectUri = Optional.empty(); @@ -209,11 +186,10 @@ public static final class Builder implements ExternalUserIdStage, ProjectIdStage private Builder() {} @java.lang.Override - public Builder from(CreateTokenRequest other) { + public Builder from(CreateTokenOpts other) { allowedOrigins(other.getAllowedOrigins()); errorRedirectUri(other.getErrorRedirectUri()); externalUserId(other.getExternalUserId()); - projectId(other.getProjectId()); successRedirectUri(other.getSuccessRedirectUri()); webhookUri(other.getWebhookUri()); return this; @@ -226,23 +202,11 @@ public Builder from(CreateTokenRequest other) { */ @java.lang.Override @JsonSetter("external_user_id") - public ProjectIdStage externalUserId(@NotNull String externalUserId) { + public _FinalStage externalUserId(@NotNull String externalUserId) { this.externalUserId = Objects.requireNonNull(externalUserId, "externalUserId must not be null"); return this; } - /** - *

The ID of the project

- *

The ID of the project

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

Webhook URI for notifications

* @return Reference to {@code this} so that method calls can be chained together. @@ -324,12 +288,11 @@ public _FinalStage allowedOrigins(Optional> allowedOrigins) { } @java.lang.Override - public CreateTokenRequest build() { - return new CreateTokenRequest( + public CreateTokenOpts build() { + return new CreateTokenOpts( allowedOrigins, errorRedirectUri, externalUserId, - projectId, successRedirectUri, webhookUri, additionalProperties); diff --git a/src/main/java/com/pipedream/api/types/ConnectTokenCreateOpts.java b/src/main/java/com/pipedream/api/types/ConnectTokenCreateOpts.java index 212cb99..fa61409 100644 --- a/src/main/java/com/pipedream/api/types/ConnectTokenCreateOpts.java +++ b/src/main/java/com/pipedream/api/types/ConnectTokenCreateOpts.java @@ -24,8 +24,6 @@ public final class ConnectTokenCreateOpts { private final String externalUserId; - private final String projectId; - private final Optional> allowedOrigins; private final Optional errorRedirectUri; @@ -38,14 +36,12 @@ public final class ConnectTokenCreateOpts { private ConnectTokenCreateOpts( String externalUserId, - String projectId, Optional> allowedOrigins, Optional errorRedirectUri, Optional successRedirectUri, Optional webhookUri, Map additionalProperties) { this.externalUserId = externalUserId; - this.projectId = projectId; this.allowedOrigins = allowedOrigins; this.errorRedirectUri = errorRedirectUri; this.successRedirectUri = successRedirectUri; @@ -61,14 +57,6 @@ public String getExternalUserId() { return externalUserId; } - /** - * @return The ID of the project - */ - @JsonProperty("project_id") - public String getProjectId() { - return projectId; - } - /** * @return List of allowed origins for CORS */ @@ -114,7 +102,6 @@ public Map getAdditionalProperties() { private boolean equalTo(ConnectTokenCreateOpts other) { return externalUserId.equals(other.externalUserId) - && projectId.equals(other.projectId) && allowedOrigins.equals(other.allowedOrigins) && errorRedirectUri.equals(other.errorRedirectUri) && successRedirectUri.equals(other.successRedirectUri) @@ -125,7 +112,6 @@ private boolean equalTo(ConnectTokenCreateOpts other) { public int hashCode() { return Objects.hash( this.externalUserId, - this.projectId, this.allowedOrigins, this.errorRedirectUri, this.successRedirectUri, @@ -145,18 +131,11 @@ public interface ExternalUserIdStage { /** *

Your end user ID, for whom you're creating the token

*/ - ProjectIdStage externalUserId(@NotNull String externalUserId); + _FinalStage externalUserId(@NotNull String externalUserId); Builder from(ConnectTokenCreateOpts other); } - public interface ProjectIdStage { - /** - *

The ID of the project

- */ - _FinalStage projectId(@NotNull String projectId); - } - public interface _FinalStage { ConnectTokenCreateOpts build(); @@ -190,11 +169,9 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements ExternalUserIdStage, ProjectIdStage, _FinalStage { + public static final class Builder implements ExternalUserIdStage, _FinalStage { private String externalUserId; - private String projectId; - private Optional webhookUri = Optional.empty(); private Optional successRedirectUri = Optional.empty(); @@ -211,7 +188,6 @@ private Builder() {} @java.lang.Override public Builder from(ConnectTokenCreateOpts other) { externalUserId(other.getExternalUserId()); - projectId(other.getProjectId()); allowedOrigins(other.getAllowedOrigins()); errorRedirectUri(other.getErrorRedirectUri()); successRedirectUri(other.getSuccessRedirectUri()); @@ -226,23 +202,11 @@ public Builder from(ConnectTokenCreateOpts other) { */ @java.lang.Override @JsonSetter("external_user_id") - public ProjectIdStage externalUserId(@NotNull String externalUserId) { + public _FinalStage externalUserId(@NotNull String externalUserId) { this.externalUserId = Objects.requireNonNull(externalUserId, "externalUserId must not be null"); return this; } - /** - *

The ID of the project

- *

The ID of the project

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

Webhook URI for notifications

* @return Reference to {@code this} so that method calls can be chained together. @@ -327,7 +291,6 @@ public _FinalStage allowedOrigins(Optional> allowedOrigins) { public ConnectTokenCreateOpts build() { return new ConnectTokenCreateOpts( externalUserId, - projectId, allowedOrigins, errorRedirectUri, successRedirectUri, diff --git a/src/main/java/com/pipedream/api/types/ProxyResponse.java b/src/main/java/com/pipedream/api/types/ProxyResponse.java deleted file mode 100644 index 60a46ab..0000000 --- a/src/main/java/com/pipedream/api/types/ProxyResponse.java +++ /dev/null @@ -1,155 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.types; - -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSetter; -import com.fasterxml.jackson.annotation.Nulls; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.pipedream.api.core.ObjectMappers; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = ProxyResponse.Builder.class) -public final class ProxyResponse { - private final Optional status; - - private final Optional> headers; - - private final Optional body; - - private final Map additionalProperties; - - private ProxyResponse( - Optional status, - Optional> headers, - Optional body, - Map additionalProperties) { - this.status = status; - this.headers = headers; - this.body = body; - this.additionalProperties = additionalProperties; - } - - /** - * @return HTTP status code - */ - @JsonProperty("status") - public Optional getStatus() { - return status; - } - - /** - * @return Response headers - */ - @JsonProperty("headers") - public Optional> getHeaders() { - return headers; - } - - @JsonProperty("body") - public Optional getBody() { - return body; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof ProxyResponse && equalTo((ProxyResponse) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(ProxyResponse other) { - return status.equals(other.status) && headers.equals(other.headers) && body.equals(other.body); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.status, this.headers, this.body); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static Builder builder() { - return new Builder(); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder { - private Optional status = Optional.empty(); - - private Optional> headers = Optional.empty(); - - private Optional body = Optional.empty(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - public Builder from(ProxyResponse other) { - status(other.getStatus()); - headers(other.getHeaders()); - body(other.getBody()); - return this; - } - - /** - *

HTTP status code

- */ - @JsonSetter(value = "status", nulls = Nulls.SKIP) - public Builder status(Optional status) { - this.status = status; - return this; - } - - public Builder status(Integer status) { - this.status = Optional.ofNullable(status); - return this; - } - - /** - *

Response headers

- */ - @JsonSetter(value = "headers", nulls = Nulls.SKIP) - public Builder headers(Optional> headers) { - this.headers = headers; - return this; - } - - public Builder headers(Map headers) { - this.headers = Optional.ofNullable(headers); - return this; - } - - @JsonSetter(value = "body", nulls = Nulls.SKIP) - public Builder body(Optional body) { - this.body = body; - return this; - } - - public Builder body(Object body) { - this.body = Optional.ofNullable(body); - return this; - } - - public ProxyResponse build() { - return new ProxyResponse(status, headers, body, additionalProperties); - } - } -}