From 6f4d231b3328d4066bc9f69582a22be92ec8976d Mon Sep 17 00:00:00 2001 From: fern-api <115122769+fern-api[bot]@users.noreply.github.com> Date: Fri, 26 Sep 2025 23:03:50 +0000 Subject: [PATCH] SDK regeneration --- README.md | 2 +- build.gradle | 4 +- .../com/pipedream/api/core/ClientOptions.java | 4 +- .../accounts/AsyncRawAccountsClient.java | 11 +- .../resources/accounts/RawAccountsClient.java | 11 +- .../requests/AccountsListRequest.java | 66 ++--- .../accounts/requests/CreateAccountOpts.java | 55 +--- .../actions/requests/RunActionOpts.java | 30 ++- .../components/AsyncRawComponentsClient.java | 4 - .../components/RawComponentsClient.java | 4 - .../requests/ComponentsListRequest.java | 37 +-- .../requests/UpdateTriggerOpts.java | 30 ++- .../triggers/requests/DeployTriggerOpts.java | 30 ++- .../java/com/pipedream/api/types/Account.java | 11 + .../pipedream/api/types/ComponentType.java | 24 -- .../pipedream/api/types/ConfigurableProp.java | 44 ++-- .../types/ConfigurablePropAirtableBaseId.java | 97 ++++--- .../ConfigurablePropAirtableFieldId.java | 97 ++++--- .../ConfigurablePropAirtableTableId.java | 97 ++++--- .../types/ConfigurablePropAirtableViewId.java | 97 ++++--- .../api/types/ConfigurablePropAlert.java | 97 ++++--- .../api/types/ConfigurablePropAny.java | 33 ++- .../api/types/ConfigurablePropApp.java | 97 ++++--- .../api/types/ConfigurablePropApphook.java | 97 ++++--- .../api/types/ConfigurablePropBoolean.java | 52 ++-- .../api/types/ConfigurablePropDb.java | 33 ++- .../api/types/ConfigurablePropDiscord.java | 33 ++- .../types/ConfigurablePropDiscordChannel.java | 97 ++++--- .../ConfigurablePropDiscordChannelArray.java | 33 ++- .../api/types/ConfigurablePropHttp.java | 33 ++- .../api/types/ConfigurablePropInteger.java | 33 ++- .../types/ConfigurablePropIntegerArray.java | 33 ++- .../api/types/ConfigurablePropObject.java | 33 ++- .../api/types/ConfigurablePropSql.java | 33 ++- .../api/types/ConfigurablePropString.java | 52 ++-- .../types/ConfigurablePropStringArray.java | 53 ++-- .../api/types/ConfigurablePropTimer.java | 33 ++- .../api/types/ConfigurablePropType.java | 66 ----- .../api/types/ConfigurePropOptionsItem.java | 95 ------- .../api/types/ConfigurePropOpts.java | 29 ++- .../api/types/ConfigurePropResponse.java | 36 ++- .../api/types/ConfiguredPropValue.java | 168 ------------ .../api/types/ConfiguredPropValueApp.java | 102 -------- .../api/types/ConfiguredPropValueSql.java | 246 ------------------ .../api/types/DeployedComponent.java | 37 ++- .../com/pipedream/api/types/Observation.java | 222 ---------------- .../pipedream/api/types/ObservationError.java | 161 ------------ .../com/pipedream/api/types/PropOption.java | 34 +-- .../pipedream/api/types/PropOptionNested.java | 102 -------- .../pipedream/api/types/PropOptionValue.java | 105 -------- .../pipedream/api/types/ReloadPropsOpts.java | 29 ++- .../api/types/ReloadPropsResponse.java | 18 +- 52 files changed, 1146 insertions(+), 1934 deletions(-) delete mode 100644 src/main/java/com/pipedream/api/types/ComponentType.java delete mode 100644 src/main/java/com/pipedream/api/types/ConfigurablePropType.java delete mode 100644 src/main/java/com/pipedream/api/types/ConfigurePropOptionsItem.java delete mode 100644 src/main/java/com/pipedream/api/types/ConfiguredPropValue.java delete mode 100644 src/main/java/com/pipedream/api/types/ConfiguredPropValueApp.java delete mode 100644 src/main/java/com/pipedream/api/types/ConfiguredPropValueSql.java delete mode 100644 src/main/java/com/pipedream/api/types/Observation.java delete mode 100644 src/main/java/com/pipedream/api/types/ObservationError.java delete mode 100644 src/main/java/com/pipedream/api/types/PropOptionNested.java delete mode 100644 src/main/java/com/pipedream/api/types/PropOptionValue.java diff --git a/README.md b/README.md index 8516429..12099c8 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Add the dependency in your `pom.xml` file: com.pipedream pipedream - 1.0.5 + 1.0.6 ``` diff --git a/build.gradle b/build.gradle index e8564b2..21ef800 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ java { group = 'com.pipedream' -version = '1.0.5' +version = '1.0.6' jar { dependsOn(":generatePomFileForMavenPublication") @@ -79,7 +79,7 @@ publishing { maven(MavenPublication) { groupId = 'com.pipedream' artifactId = 'pipedream' - version = '1.0.5' + version = '1.0.6' from components.java pom { name = 'pipedream' diff --git a/src/main/java/com/pipedream/api/core/ClientOptions.java b/src/main/java/com/pipedream/api/core/ClientOptions.java index 1dd75f9..8e17e45 100644 --- a/src/main/java/com/pipedream/api/core/ClientOptions.java +++ b/src/main/java/com/pipedream/api/core/ClientOptions.java @@ -35,10 +35,10 @@ private ClientOptions( this.headers.putAll(headers); this.headers.putAll(new HashMap() { { - put("User-Agent", "com.pipedream:pipedream/1.0.5"); + put("User-Agent", "com.pipedream:pipedream/1.0.6"); put("X-Fern-Language", "JAVA"); put("X-Fern-SDK-Name", "com.pipedream.fern:api-sdk"); - put("X-Fern-SDK-Version", "1.0.5"); + put("X-Fern-SDK-Version", "1.0.6"); } }); this.headerSuppliers = headerSuppliers; diff --git a/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java b/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java index 3aff3e1..cfc0781 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java +++ b/src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java @@ -68,10 +68,6 @@ public CompletableFuture>> li .addPathSegments("v1/connect") .addPathSegment(clientOptions.projectId()) .addPathSegments("accounts"); - if (request.getAppId().isPresent()) { - QueryStringMapper.addQueryParameter( - httpUrl, "app_id", request.getAppId().get(), false); - } if (request.getExternalUserId().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "external_user_id", request.getExternalUserId().get(), false); @@ -92,6 +88,9 @@ public CompletableFuture>> li QueryStringMapper.addQueryParameter( httpUrl, "limit", request.getLimit().get(), false); } + if (request.getApp().isPresent()) { + QueryStringMapper.addQueryParameter(httpUrl, "app", request.getApp().get(), false); + } if (request.getIncludeCredentials().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, @@ -183,10 +182,6 @@ public CompletableFuture> create( .addPathSegments("v1/connect") .addPathSegment(clientOptions.projectId()) .addPathSegments("accounts"); - if (request.getAppId().isPresent()) { - QueryStringMapper.addQueryParameter( - httpUrl, "app_id", request.getAppId().get(), false); - } if (request.getExternalUserId().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "external_user_id", request.getExternalUserId().get(), false); 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 9692016..004dd72 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java +++ b/src/main/java/com/pipedream/api/resources/accounts/RawAccountsClient.java @@ -63,10 +63,6 @@ public BaseClientHttpResponse> list( .addPathSegments("v1/connect") .addPathSegment(clientOptions.projectId()) .addPathSegments("accounts"); - if (request.getAppId().isPresent()) { - QueryStringMapper.addQueryParameter( - httpUrl, "app_id", request.getAppId().get(), false); - } if (request.getExternalUserId().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "external_user_id", request.getExternalUserId().get(), false); @@ -87,6 +83,9 @@ public BaseClientHttpResponse> list( QueryStringMapper.addQueryParameter( httpUrl, "limit", request.getLimit().get(), false); } + if (request.getApp().isPresent()) { + QueryStringMapper.addQueryParameter(httpUrl, "app", request.getApp().get(), false); + } if (request.getIncludeCredentials().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, @@ -156,10 +155,6 @@ public BaseClientHttpResponse create(CreateAccountOpts request, Request .addPathSegments("v1/connect") .addPathSegment(clientOptions.projectId()) .addPathSegments("accounts"); - if (request.getAppId().isPresent()) { - QueryStringMapper.addQueryParameter( - httpUrl, "app_id", request.getAppId().get(), false); - } if (request.getExternalUserId().isPresent()) { QueryStringMapper.addQueryParameter( httpUrl, "external_user_id", request.getExternalUserId().get(), false); diff --git a/src/main/java/com/pipedream/api/resources/accounts/requests/AccountsListRequest.java b/src/main/java/com/pipedream/api/resources/accounts/requests/AccountsListRequest.java index 2d67f6d..bfba211 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/requests/AccountsListRequest.java +++ b/src/main/java/com/pipedream/api/resources/accounts/requests/AccountsListRequest.java @@ -20,8 +20,6 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = AccountsListRequest.Builder.class) public final class AccountsListRequest { - private final Optional appId; - private final Optional externalUserId; private final Optional oauthAppId; @@ -32,37 +30,31 @@ public final class AccountsListRequest { private final Optional limit; + private final Optional app; + private final Optional includeCredentials; private final Map additionalProperties; private AccountsListRequest( - Optional appId, Optional externalUserId, Optional oauthAppId, Optional after, Optional before, Optional limit, + Optional app, Optional includeCredentials, Map additionalProperties) { - this.appId = appId; this.externalUserId = externalUserId; this.oauthAppId = oauthAppId; this.after = after; this.before = before; this.limit = limit; + this.app = app; this.includeCredentials = includeCredentials; this.additionalProperties = additionalProperties; } - /** - * @return The app slug or ID to filter accounts by. - */ - @JsonProperty("app_id") - public Optional getAppId() { - return appId; - } - @JsonProperty("external_user_id") public Optional getExternalUserId() { return externalUserId; @@ -100,6 +92,14 @@ public Optional getLimit() { return limit; } + /** + * @return The app slug or ID to filter accounts by. + */ + @JsonProperty("app") + public Optional getApp() { + return app; + } + /** * @return Whether to retrieve the account's credentials or not */ @@ -120,24 +120,24 @@ public Map getAdditionalProperties() { } private boolean equalTo(AccountsListRequest other) { - return appId.equals(other.appId) - && externalUserId.equals(other.externalUserId) + return externalUserId.equals(other.externalUserId) && oauthAppId.equals(other.oauthAppId) && after.equals(other.after) && before.equals(other.before) && limit.equals(other.limit) + && app.equals(other.app) && includeCredentials.equals(other.includeCredentials); } @java.lang.Override public int hashCode() { return Objects.hash( - this.appId, this.externalUserId, this.oauthAppId, this.after, this.before, this.limit, + this.app, this.includeCredentials); } @@ -152,8 +152,6 @@ public static Builder builder() { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder { - private Optional appId = Optional.empty(); - private Optional externalUserId = Optional.empty(); private Optional oauthAppId = Optional.empty(); @@ -164,6 +162,8 @@ public static final class Builder { private Optional limit = Optional.empty(); + private Optional app = Optional.empty(); + private Optional includeCredentials = Optional.empty(); @JsonAnySetter @@ -172,30 +172,16 @@ public static final class Builder { private Builder() {} public Builder from(AccountsListRequest other) { - appId(other.getAppId()); externalUserId(other.getExternalUserId()); oauthAppId(other.getOauthAppId()); after(other.getAfter()); before(other.getBefore()); limit(other.getLimit()); + app(other.getApp()); includeCredentials(other.getIncludeCredentials()); return this; } - /** - *

The app slug or ID to filter accounts by.

- */ - @JsonSetter(value = "app_id", nulls = Nulls.SKIP) - public Builder appId(Optional appId) { - this.appId = appId; - return this; - } - - public Builder appId(String appId) { - this.appId = Optional.ofNullable(appId); - return this; - } - @JsonSetter(value = "external_user_id", nulls = Nulls.SKIP) public Builder externalUserId(Optional externalUserId) { this.externalUserId = externalUserId; @@ -263,6 +249,20 @@ public Builder limit(Integer limit) { return this; } + /** + *

The app slug or ID to filter accounts by.

+ */ + @JsonSetter(value = "app", nulls = Nulls.SKIP) + public Builder app(Optional app) { + this.app = app; + return this; + } + + public Builder app(String app) { + this.app = Optional.ofNullable(app); + return this; + } + /** *

Whether to retrieve the account's credentials or not

*/ @@ -279,7 +279,7 @@ public Builder includeCredentials(Boolean includeCredentials) { public AccountsListRequest build() { return new AccountsListRequest( - appId, externalUserId, oauthAppId, after, before, limit, includeCredentials, additionalProperties); + externalUserId, oauthAppId, after, before, limit, app, includeCredentials, additionalProperties); } } } diff --git a/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountOpts.java b/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountOpts.java index 79cef5e..d168d25 100644 --- a/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountOpts.java +++ b/src/main/java/com/pipedream/api/resources/accounts/requests/CreateAccountOpts.java @@ -21,8 +21,6 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = CreateAccountOpts.Builder.class) public final class CreateAccountOpts { - private final Optional appId; - private final Optional externalUserId; private final Optional oauthAppId; @@ -38,7 +36,6 @@ public final class CreateAccountOpts { private final Map additionalProperties; private CreateAccountOpts( - Optional appId, Optional externalUserId, Optional oauthAppId, String appSlug, @@ -46,7 +43,6 @@ private CreateAccountOpts( String connectToken, Optional name, Map additionalProperties) { - this.appId = appId; this.externalUserId = externalUserId; this.oauthAppId = oauthAppId; this.appSlug = appSlug; @@ -56,14 +52,6 @@ private CreateAccountOpts( this.additionalProperties = additionalProperties; } - /** - * @return The app slug or ID to filter accounts by. - */ - @JsonProperty("app_id") - public Optional getAppId() { - return appId; - } - @JsonProperty("external_user_id") public Optional getExternalUserId() { return externalUserId; @@ -121,8 +109,7 @@ public Map getAdditionalProperties() { } private boolean equalTo(CreateAccountOpts other) { - return appId.equals(other.appId) - && externalUserId.equals(other.externalUserId) + return externalUserId.equals(other.externalUserId) && oauthAppId.equals(other.oauthAppId) && appSlug.equals(other.appSlug) && cfmapJson.equals(other.cfmapJson) @@ -133,13 +120,7 @@ private boolean equalTo(CreateAccountOpts other) { @java.lang.Override public int hashCode() { return Objects.hash( - this.appId, - this.externalUserId, - this.oauthAppId, - this.appSlug, - this.cfmapJson, - this.connectToken, - this.name); + this.externalUserId, this.oauthAppId, this.appSlug, this.cfmapJson, this.connectToken, this.name); } @java.lang.Override @@ -177,13 +158,6 @@ public interface ConnectTokenStage { public interface _FinalStage { CreateAccountOpts build(); - /** - *

The app slug or ID to filter accounts by.

- */ - _FinalStage appId(Optional appId); - - _FinalStage appId(String appId); - _FinalStage externalUserId(Optional externalUserId); _FinalStage externalUserId(String externalUserId); @@ -217,8 +191,6 @@ public static final class Builder implements AppSlugStage, CfmapJsonStage, Conne private Optional externalUserId = Optional.empty(); - private Optional appId = Optional.empty(); - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -226,7 +198,6 @@ private Builder() {} @java.lang.Override public Builder from(CreateAccountOpts other) { - appId(other.getAppId()); externalUserId(other.getExternalUserId()); oauthAppId(other.getOauthAppId()); appSlug(other.getAppSlug()); @@ -325,30 +296,10 @@ public _FinalStage externalUserId(Optional externalUserId) { return this; } - /** - *

The app slug or ID to filter accounts by.

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

The app slug or ID to filter accounts by.

- */ - @java.lang.Override - @JsonSetter(value = "app_id", nulls = Nulls.SKIP) - public _FinalStage appId(Optional appId) { - this.appId = appId; - return this; - } - @java.lang.Override public CreateAccountOpts build() { return new CreateAccountOpts( - appId, externalUserId, oauthAppId, appSlug, cfmapJson, connectToken, name, additionalProperties); + externalUserId, oauthAppId, appSlug, cfmapJson, connectToken, name, additionalProperties); } } } diff --git a/src/main/java/com/pipedream/api/resources/actions/requests/RunActionOpts.java b/src/main/java/com/pipedream/api/resources/actions/requests/RunActionOpts.java index bb339b5..afbc0ee 100644 --- a/src/main/java/com/pipedream/api/resources/actions/requests/RunActionOpts.java +++ b/src/main/java/com/pipedream/api/resources/actions/requests/RunActionOpts.java @@ -12,7 +12,6 @@ import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.types.ConfiguredPropValue; import com.pipedream.api.types.RunActionOptsStashId; import java.util.HashMap; import java.util.Map; @@ -27,7 +26,7 @@ public final class RunActionOpts { private final String externalUserId; - private final Optional> configuredProps; + private final Optional> configuredProps; private final Optional dynamicPropsId; @@ -38,7 +37,7 @@ public final class RunActionOpts { private RunActionOpts( String id, String externalUserId, - Optional> configuredProps, + Optional> configuredProps, Optional dynamicPropsId, Optional stashId, Map additionalProperties) { @@ -66,8 +65,11 @@ public String getExternalUserId() { return externalUserId; } + /** + * @return The configured properties for the action + */ @JsonProperty("configured_props") - public Optional> getConfiguredProps() { + public Optional> getConfiguredProps() { return configuredProps; } @@ -136,9 +138,12 @@ public interface ExternalUserIdStage { public interface _FinalStage { RunActionOpts build(); - _FinalStage configuredProps(Optional> configuredProps); + /** + *

The configured properties for the action

+ */ + _FinalStage configuredProps(Optional> configuredProps); - _FinalStage configuredProps(Map configuredProps); + _FinalStage configuredProps(Map configuredProps); /** *

The ID for dynamic props

@@ -162,7 +167,7 @@ public static final class Builder implements IdStage, ExternalUserIdStage, _Fina private Optional dynamicPropsId = Optional.empty(); - private Optional> configuredProps = Optional.empty(); + private Optional> configuredProps = Optional.empty(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -236,15 +241,22 @@ public _FinalStage dynamicPropsId(Optional dynamicPropsId) { return this; } + /** + *

The configured properties for the action

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

The configured properties for the action

+ */ @java.lang.Override @JsonSetter(value = "configured_props", nulls = Nulls.SKIP) - public _FinalStage configuredProps(Optional> configuredProps) { + public _FinalStage configuredProps(Optional> configuredProps) { this.configuredProps = configuredProps; return this; } diff --git a/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java b/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java index f9290c2..8ce2673 100644 --- a/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java +++ b/src/main/java/com/pipedream/api/resources/components/AsyncRawComponentsClient.java @@ -88,10 +88,6 @@ public CompletableFuture>> if (request.getApp().isPresent()) { QueryStringMapper.addQueryParameter(httpUrl, "app", request.getApp().get(), false); } - if (request.getComponentType().isPresent()) { - QueryStringMapper.addQueryParameter( - httpUrl, "component_type", request.getComponentType().get(), false); - } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) diff --git a/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java b/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java index d9debeb..1c4bb67 100644 --- a/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java +++ b/src/main/java/com/pipedream/api/resources/components/RawComponentsClient.java @@ -82,10 +82,6 @@ public BaseClientHttpResponse> list( if (request.getApp().isPresent()) { QueryStringMapper.addQueryParameter(httpUrl, "app", request.getApp().get(), false); } - if (request.getComponentType().isPresent()) { - QueryStringMapper.addQueryParameter( - httpUrl, "component_type", request.getComponentType().get(), false); - } Request.Builder _requestBuilder = new Request.Builder() .url(httpUrl.build()) .method("GET", null) diff --git a/src/main/java/com/pipedream/api/resources/components/requests/ComponentsListRequest.java b/src/main/java/com/pipedream/api/resources/components/requests/ComponentsListRequest.java index f1e64a3..8d5b23b 100644 --- a/src/main/java/com/pipedream/api/resources/components/requests/ComponentsListRequest.java +++ b/src/main/java/com/pipedream/api/resources/components/requests/ComponentsListRequest.java @@ -12,7 +12,6 @@ import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.types.ComponentType; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -31,8 +30,6 @@ public final class ComponentsListRequest { private final Optional app; - private final Optional componentType; - private final Map additionalProperties; private ComponentsListRequest( @@ -41,14 +38,12 @@ private ComponentsListRequest( Optional limit, Optional q, Optional app, - Optional componentType, Map additionalProperties) { this.after = after; this.before = before; this.limit = limit; this.q = q; this.app = app; - this.componentType = componentType; this.additionalProperties = additionalProperties; } @@ -92,14 +87,6 @@ public Optional getApp() { return app; } - /** - * @return The type of the component to filter the components - */ - @JsonProperty("component_type") - public Optional getComponentType() { - return componentType; - } - @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -116,13 +103,12 @@ private boolean equalTo(ComponentsListRequest other) { && before.equals(other.before) && limit.equals(other.limit) && q.equals(other.q) - && app.equals(other.app) - && componentType.equals(other.componentType); + && app.equals(other.app); } @java.lang.Override public int hashCode() { - return Objects.hash(this.after, this.before, this.limit, this.q, this.app, this.componentType); + return Objects.hash(this.after, this.before, this.limit, this.q, this.app); } @java.lang.Override @@ -146,8 +132,6 @@ public static final class Builder { private Optional app = Optional.empty(); - private Optional componentType = Optional.empty(); - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -159,7 +143,6 @@ public Builder from(ComponentsListRequest other) { limit(other.getLimit()); q(other.getQ()); app(other.getApp()); - componentType(other.getComponentType()); return this; } @@ -233,22 +216,8 @@ public Builder app(String app) { return this; } - /** - *

The type of the component to filter the components

- */ - @JsonSetter(value = "component_type", nulls = Nulls.SKIP) - public Builder componentType(Optional componentType) { - this.componentType = componentType; - return this; - } - - public Builder componentType(ComponentType componentType) { - this.componentType = Optional.ofNullable(componentType); - return this; - } - public ComponentsListRequest build() { - return new ComponentsListRequest(after, before, limit, q, app, componentType, additionalProperties); + return new ComponentsListRequest(after, before, limit, q, app, additionalProperties); } } } diff --git a/src/main/java/com/pipedream/api/resources/deployedtriggers/requests/UpdateTriggerOpts.java b/src/main/java/com/pipedream/api/resources/deployedtriggers/requests/UpdateTriggerOpts.java index b7b613b..735cf4a 100644 --- a/src/main/java/com/pipedream/api/resources/deployedtriggers/requests/UpdateTriggerOpts.java +++ b/src/main/java/com/pipedream/api/resources/deployedtriggers/requests/UpdateTriggerOpts.java @@ -12,7 +12,6 @@ import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.types.ConfiguredPropValue; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -26,7 +25,7 @@ public final class UpdateTriggerOpts { private final Optional active; - private final Optional> configuredProps; + private final Optional> configuredProps; private final Optional name; @@ -35,7 +34,7 @@ public final class UpdateTriggerOpts { private UpdateTriggerOpts( String externalUserId, Optional active, - Optional> configuredProps, + Optional> configuredProps, Optional name, Map additionalProperties) { this.externalUserId = externalUserId; @@ -61,8 +60,11 @@ public Optional getActive() { return active; } + /** + * @return The configured properties for the trigger + */ @JsonProperty("configured_props") - public Optional> getConfiguredProps() { + public Optional> getConfiguredProps() { return configuredProps; } @@ -125,9 +127,12 @@ public interface _FinalStage { _FinalStage active(Boolean active); - _FinalStage configuredProps(Optional> configuredProps); + /** + *

The configured properties for the trigger

+ */ + _FinalStage configuredProps(Optional> configuredProps); - _FinalStage configuredProps(Map configuredProps); + _FinalStage configuredProps(Map configuredProps); /** *

The name of the trigger

@@ -143,7 +148,7 @@ public static final class Builder implements ExternalUserIdStage, _FinalStage { private Optional name = Optional.empty(); - private Optional> configuredProps = Optional.empty(); + private Optional> configuredProps = Optional.empty(); private Optional active = Optional.empty(); @@ -193,15 +198,22 @@ public _FinalStage name(Optional name) { return this; } + /** + *

The configured properties for the trigger

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

The configured properties for the trigger

+ */ @java.lang.Override @JsonSetter(value = "configured_props", nulls = Nulls.SKIP) - public _FinalStage configuredProps(Optional> configuredProps) { + public _FinalStage configuredProps(Optional> configuredProps) { this.configuredProps = configuredProps; return this; } diff --git a/src/main/java/com/pipedream/api/resources/triggers/requests/DeployTriggerOpts.java b/src/main/java/com/pipedream/api/resources/triggers/requests/DeployTriggerOpts.java index 8e151d3..b45a651 100644 --- a/src/main/java/com/pipedream/api/resources/triggers/requests/DeployTriggerOpts.java +++ b/src/main/java/com/pipedream/api/resources/triggers/requests/DeployTriggerOpts.java @@ -12,7 +12,6 @@ import com.fasterxml.jackson.annotation.Nulls; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.pipedream.api.core.ObjectMappers; -import com.pipedream.api.types.ConfiguredPropValue; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -26,7 +25,7 @@ public final class DeployTriggerOpts { private final String externalUserId; - private final Optional> configuredProps; + private final Optional> configuredProps; private final Optional dynamicPropsId; @@ -37,7 +36,7 @@ public final class DeployTriggerOpts { private DeployTriggerOpts( String id, String externalUserId, - Optional> configuredProps, + Optional> configuredProps, Optional dynamicPropsId, Optional webhookUrl, Map additionalProperties) { @@ -65,8 +64,11 @@ public String getExternalUserId() { return externalUserId; } + /** + * @return The configured properties for the trigger + */ @JsonProperty("configured_props") - public Optional> getConfiguredProps() { + public Optional> getConfiguredProps() { return configuredProps; } @@ -138,9 +140,12 @@ public interface ExternalUserIdStage { public interface _FinalStage { DeployTriggerOpts build(); - _FinalStage configuredProps(Optional> configuredProps); + /** + *

The configured properties for the trigger

+ */ + _FinalStage configuredProps(Optional> configuredProps); - _FinalStage configuredProps(Map configuredProps); + _FinalStage configuredProps(Map configuredProps); /** *

The ID for dynamic props

@@ -167,7 +172,7 @@ public static final class Builder implements IdStage, ExternalUserIdStage, _Fina private Optional dynamicPropsId = Optional.empty(); - private Optional> configuredProps = Optional.empty(); + private Optional> configuredProps = Optional.empty(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -248,15 +253,22 @@ public _FinalStage dynamicPropsId(Optional dynamicPropsId) { return this; } + /** + *

The configured properties for the trigger

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

The configured properties for the trigger

+ */ @java.lang.Override @JsonSetter(value = "configured_props", nulls = Nulls.SKIP) - public _FinalStage configuredProps(Optional> configuredProps) { + public _FinalStage configuredProps(Optional> configuredProps) { this.configuredProps = configuredProps; return this; } diff --git a/src/main/java/com/pipedream/api/types/Account.java b/src/main/java/com/pipedream/api/types/Account.java index 3c14085..695b457 100644 --- a/src/main/java/com/pipedream/api/types/Account.java +++ b/src/main/java/com/pipedream/api/types/Account.java @@ -81,6 +81,9 @@ private Account( this.additionalProperties = additionalProperties; } + /** + * @return The unique ID of the account. + */ @JsonProperty("id") public String getId() { return id; @@ -234,6 +237,9 @@ public static IdStage builder() { } public interface IdStage { + /** + *

The unique ID of the account.

+ */ _FinalStage id(@NotNull String id); Builder from(Account other); @@ -375,6 +381,11 @@ public Builder from(Account other) { return this; } + /** + *

The unique ID of the account.

+ *

The unique ID of the account.

+ * @return Reference to {@code this} so that method calls can be chained together. + */ @java.lang.Override @JsonSetter("id") public _FinalStage id(@NotNull String id) { diff --git a/src/main/java/com/pipedream/api/types/ComponentType.java b/src/main/java/com/pipedream/api/types/ComponentType.java deleted file mode 100644 index 660d63f..0000000 --- a/src/main/java/com/pipedream/api/types/ComponentType.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.types; - -import com.fasterxml.jackson.annotation.JsonValue; - -public enum ComponentType { - TRIGGER("trigger"), - - ACTION("action"); - - private final String value; - - ComponentType(String value) { - this.value = value; - } - - @JsonValue - @java.lang.Override - public String toString() { - return this.value; - } -} diff --git a/src/main/java/com/pipedream/api/types/ConfigurableProp.java b/src/main/java/com/pipedream/api/types/ConfigurableProp.java index 4c5213e..014fbe5 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurableProp.java +++ b/src/main/java/com/pipedream/api/types/ConfigurableProp.java @@ -23,7 +23,7 @@ public final class ConfigurableProp { private final String name; - private final ConfigurablePropType type; + private final Optional type; private final Optional label; @@ -47,7 +47,7 @@ public final class ConfigurableProp { private ConfigurableProp( String name, - ConfigurablePropType type, + Optional type, Optional label, Optional description, Optional optional, @@ -81,7 +81,7 @@ public String getName() { } @JsonProperty("type") - public ConfigurablePropType getType() { + public Optional getType() { return type; } @@ -211,18 +211,18 @@ public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ - TypeStage name(@NotNull String name); + _FinalStage name(@NotNull String name); Builder from(ConfigurableProp other); } - public interface TypeStage { - _FinalStage type(@NotNull ConfigurablePropType type); - } - public interface _FinalStage { ConfigurableProp build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -288,11 +288,9 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements NameStage, TypeStage, _FinalStage { + public static final class Builder implements NameStage, _FinalStage { private String name; - private ConfigurablePropType type; - private Optional withLabel = Optional.empty(); private Optional reloadProps = Optional.empty(); @@ -311,6 +309,8 @@ public static final class Builder implements NameStage, TypeStage, _FinalStage { private Optional label = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -339,18 +339,11 @@ public Builder from(ConfigurableProp other) { */ @java.lang.Override @JsonSetter("name") - public TypeStage name(@NotNull String name) { + public _FinalStage name(@NotNull String name) { this.name = Objects.requireNonNull(name, "name must not be null"); return this; } - @java.lang.Override - @JsonSetter("type") - public _FinalStage type(@NotNull ConfigurablePropType type) { - this.type = Objects.requireNonNull(type, "type must not be null"); - return this; - } - /** *

If true, you must save the configured prop value as a "label-value" object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label

* @return Reference to {@code this} so that method calls can be chained together. @@ -531,6 +524,19 @@ public _FinalStage label(Optional label) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurableProp build() { return new ConfigurableProp( diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableBaseId.java b/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableBaseId.java index 4e70c27..df43432 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableBaseId.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableBaseId.java @@ -21,7 +21,9 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropAirtableBaseId.Builder.class) public final class ConfigurablePropAirtableBaseId { - private final String appProp; + private final Optional type; + + private final Optional appProp; private final String name; @@ -46,7 +48,8 @@ public final class ConfigurablePropAirtableBaseId { private final Map additionalProperties; private ConfigurablePropAirtableBaseId( - String appProp, + Optional type, + Optional appProp, String name, Optional label, Optional description, @@ -58,6 +61,7 @@ private ConfigurablePropAirtableBaseId( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.appProp = appProp; this.name = name; this.label = label; @@ -73,15 +77,15 @@ private ConfigurablePropAirtableBaseId( } @JsonProperty("type") - public String getType() { - return "$.airtable.baseId"; + public Optional getType() { + return type; } /** * @return The name of the app prop that provides Airtable authentication */ @JsonProperty("appProp") - public String getAppProp() { + public Optional getAppProp() { return appProp; } @@ -177,7 +181,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropAirtableBaseId other) { - return appProp.equals(other.appProp) + return type.equals(other.type) + && appProp.equals(other.appProp) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -193,6 +198,7 @@ private boolean equalTo(ConfigurablePropAirtableBaseId other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.appProp, this.name, this.label, @@ -211,29 +217,33 @@ public String toString() { return ObjectMappers.stringify(this); } - public static AppPropStage builder() { + public static NameStage builder() { return new Builder(); } - public interface AppPropStage { - /** - *

The name of the app prop that provides Airtable authentication

- */ - NameStage appProp(@NotNull String appProp); - - Builder from(ConfigurablePropAirtableBaseId other); - } - public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ _FinalStage name(@NotNull String name); + + Builder from(ConfigurablePropAirtableBaseId other); } public interface _FinalStage { ConfigurablePropAirtableBaseId build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + + /** + *

The name of the app prop that provides Airtable authentication

+ */ + _FinalStage appProp(Optional appProp); + + _FinalStage appProp(String appProp); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,9 +309,7 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements AppPropStage, NameStage, _FinalStage { - private String appProp; - + public static final class Builder implements NameStage, _FinalStage { private String name; private Optional withLabel = Optional.empty(); @@ -322,6 +330,10 @@ public static final class Builder implements AppPropStage, NameStage, _FinalStag private Optional label = Optional.empty(); + private Optional appProp = Optional.empty(); + + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -329,6 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropAirtableBaseId other) { + type(other.getType()); appProp(other.getAppProp()); name(other.getName()); label(other.getLabel()); @@ -343,18 +356,6 @@ public Builder from(ConfigurablePropAirtableBaseId other) { return this; } - /** - *

The name of the app prop that provides Airtable authentication

- *

The name of the app prop that provides Airtable authentication

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

When building configuredProps, make sure to use this field as the key when setting the prop value

*

When building configuredProps, make sure to use this field as the key when setting the prop value

@@ -547,9 +548,43 @@ public _FinalStage label(Optional label) { return this; } + /** + *

The name of the app prop that provides Airtable authentication

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

The name of the app prop that provides Airtable authentication

+ */ + @java.lang.Override + @JsonSetter(value = "appProp", nulls = Nulls.SKIP) + public _FinalStage appProp(Optional appProp) { + this.appProp = appProp; + return this; + } + + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropAirtableBaseId build() { return new ConfigurablePropAirtableBaseId( + type, appProp, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableFieldId.java b/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableFieldId.java index 04b67ca..aef7374 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableFieldId.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableFieldId.java @@ -21,7 +21,9 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropAirtableFieldId.Builder.class) public final class ConfigurablePropAirtableFieldId { - private final String tableIdProp; + private final Optional type; + + private final Optional tableIdProp; private final String name; @@ -46,7 +48,8 @@ public final class ConfigurablePropAirtableFieldId { private final Map additionalProperties; private ConfigurablePropAirtableFieldId( - String tableIdProp, + Optional type, + Optional tableIdProp, String name, Optional label, Optional description, @@ -58,6 +61,7 @@ private ConfigurablePropAirtableFieldId( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.tableIdProp = tableIdProp; this.name = name; this.label = label; @@ -73,15 +77,15 @@ private ConfigurablePropAirtableFieldId( } @JsonProperty("type") - public String getType() { - return "$.airtable.fieldId"; + public Optional getType() { + return type; } /** * @return The name of the prop that provides the Airtable table ID */ @JsonProperty("tableIdProp") - public String getTableIdProp() { + public Optional getTableIdProp() { return tableIdProp; } @@ -177,7 +181,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropAirtableFieldId other) { - return tableIdProp.equals(other.tableIdProp) + return type.equals(other.type) + && tableIdProp.equals(other.tableIdProp) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -193,6 +198,7 @@ private boolean equalTo(ConfigurablePropAirtableFieldId other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.tableIdProp, this.name, this.label, @@ -211,29 +217,33 @@ public String toString() { return ObjectMappers.stringify(this); } - public static TableIdPropStage builder() { + public static NameStage builder() { return new Builder(); } - public interface TableIdPropStage { - /** - *

The name of the prop that provides the Airtable table ID

- */ - NameStage tableIdProp(@NotNull String tableIdProp); - - Builder from(ConfigurablePropAirtableFieldId other); - } - public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ _FinalStage name(@NotNull String name); + + Builder from(ConfigurablePropAirtableFieldId other); } public interface _FinalStage { ConfigurablePropAirtableFieldId build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + + /** + *

The name of the prop that provides the Airtable table ID

+ */ + _FinalStage tableIdProp(Optional tableIdProp); + + _FinalStage tableIdProp(String tableIdProp); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,9 +309,7 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements TableIdPropStage, NameStage, _FinalStage { - private String tableIdProp; - + public static final class Builder implements NameStage, _FinalStage { private String name; private Optional withLabel = Optional.empty(); @@ -322,6 +330,10 @@ public static final class Builder implements TableIdPropStage, NameStage, _Final private Optional label = Optional.empty(); + private Optional tableIdProp = Optional.empty(); + + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -329,6 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropAirtableFieldId other) { + type(other.getType()); tableIdProp(other.getTableIdProp()); name(other.getName()); label(other.getLabel()); @@ -343,18 +356,6 @@ public Builder from(ConfigurablePropAirtableFieldId other) { return this; } - /** - *

The name of the prop that provides the Airtable table ID

- *

The name of the prop that provides the Airtable table ID

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

When building configuredProps, make sure to use this field as the key when setting the prop value

*

When building configuredProps, make sure to use this field as the key when setting the prop value

@@ -547,9 +548,43 @@ public _FinalStage label(Optional label) { return this; } + /** + *

The name of the prop that provides the Airtable table ID

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

The name of the prop that provides the Airtable table ID

+ */ + @java.lang.Override + @JsonSetter(value = "tableIdProp", nulls = Nulls.SKIP) + public _FinalStage tableIdProp(Optional tableIdProp) { + this.tableIdProp = tableIdProp; + return this; + } + + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropAirtableFieldId build() { return new ConfigurablePropAirtableFieldId( + type, tableIdProp, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableTableId.java b/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableTableId.java index 0ceeaee..be315c4 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableTableId.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableTableId.java @@ -21,7 +21,9 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropAirtableTableId.Builder.class) public final class ConfigurablePropAirtableTableId { - private final String baseIdProp; + private final Optional type; + + private final Optional baseIdProp; private final String name; @@ -46,7 +48,8 @@ public final class ConfigurablePropAirtableTableId { private final Map additionalProperties; private ConfigurablePropAirtableTableId( - String baseIdProp, + Optional type, + Optional baseIdProp, String name, Optional label, Optional description, @@ -58,6 +61,7 @@ private ConfigurablePropAirtableTableId( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.baseIdProp = baseIdProp; this.name = name; this.label = label; @@ -73,15 +77,15 @@ private ConfigurablePropAirtableTableId( } @JsonProperty("type") - public String getType() { - return "$.airtable.tableId"; + public Optional getType() { + return type; } /** * @return The name of the prop that provides the Airtable base ID */ @JsonProperty("baseIdProp") - public String getBaseIdProp() { + public Optional getBaseIdProp() { return baseIdProp; } @@ -177,7 +181,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropAirtableTableId other) { - return baseIdProp.equals(other.baseIdProp) + return type.equals(other.type) + && baseIdProp.equals(other.baseIdProp) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -193,6 +198,7 @@ private boolean equalTo(ConfigurablePropAirtableTableId other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.baseIdProp, this.name, this.label, @@ -211,29 +217,33 @@ public String toString() { return ObjectMappers.stringify(this); } - public static BaseIdPropStage builder() { + public static NameStage builder() { return new Builder(); } - public interface BaseIdPropStage { - /** - *

The name of the prop that provides the Airtable base ID

- */ - NameStage baseIdProp(@NotNull String baseIdProp); - - Builder from(ConfigurablePropAirtableTableId other); - } - public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ _FinalStage name(@NotNull String name); + + Builder from(ConfigurablePropAirtableTableId other); } public interface _FinalStage { ConfigurablePropAirtableTableId build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + + /** + *

The name of the prop that provides the Airtable base ID

+ */ + _FinalStage baseIdProp(Optional baseIdProp); + + _FinalStage baseIdProp(String baseIdProp); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,9 +309,7 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements BaseIdPropStage, NameStage, _FinalStage { - private String baseIdProp; - + public static final class Builder implements NameStage, _FinalStage { private String name; private Optional withLabel = Optional.empty(); @@ -322,6 +330,10 @@ public static final class Builder implements BaseIdPropStage, NameStage, _FinalS private Optional label = Optional.empty(); + private Optional baseIdProp = Optional.empty(); + + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -329,6 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropAirtableTableId other) { + type(other.getType()); baseIdProp(other.getBaseIdProp()); name(other.getName()); label(other.getLabel()); @@ -343,18 +356,6 @@ public Builder from(ConfigurablePropAirtableTableId other) { return this; } - /** - *

The name of the prop that provides the Airtable base ID

- *

The name of the prop that provides the Airtable base ID

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

When building configuredProps, make sure to use this field as the key when setting the prop value

*

When building configuredProps, make sure to use this field as the key when setting the prop value

@@ -547,9 +548,43 @@ public _FinalStage label(Optional label) { return this; } + /** + *

The name of the prop that provides the Airtable base ID

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

The name of the prop that provides the Airtable base ID

+ */ + @java.lang.Override + @JsonSetter(value = "baseIdProp", nulls = Nulls.SKIP) + public _FinalStage baseIdProp(Optional baseIdProp) { + this.baseIdProp = baseIdProp; + return this; + } + + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropAirtableTableId build() { return new ConfigurablePropAirtableTableId( + type, baseIdProp, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableViewId.java b/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableViewId.java index 0104c20..3a29b7a 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableViewId.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropAirtableViewId.java @@ -21,7 +21,9 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropAirtableViewId.Builder.class) public final class ConfigurablePropAirtableViewId { - private final String tableIdProp; + private final Optional type; + + private final Optional tableIdProp; private final String name; @@ -46,7 +48,8 @@ public final class ConfigurablePropAirtableViewId { private final Map additionalProperties; private ConfigurablePropAirtableViewId( - String tableIdProp, + Optional type, + Optional tableIdProp, String name, Optional label, Optional description, @@ -58,6 +61,7 @@ private ConfigurablePropAirtableViewId( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.tableIdProp = tableIdProp; this.name = name; this.label = label; @@ -73,15 +77,15 @@ private ConfigurablePropAirtableViewId( } @JsonProperty("type") - public String getType() { - return "$.airtable.viewId"; + public Optional getType() { + return type; } /** * @return The name of the prop that provides the Airtable table ID */ @JsonProperty("tableIdProp") - public String getTableIdProp() { + public Optional getTableIdProp() { return tableIdProp; } @@ -177,7 +181,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropAirtableViewId other) { - return tableIdProp.equals(other.tableIdProp) + return type.equals(other.type) + && tableIdProp.equals(other.tableIdProp) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -193,6 +198,7 @@ private boolean equalTo(ConfigurablePropAirtableViewId other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.tableIdProp, this.name, this.label, @@ -211,29 +217,33 @@ public String toString() { return ObjectMappers.stringify(this); } - public static TableIdPropStage builder() { + public static NameStage builder() { return new Builder(); } - public interface TableIdPropStage { - /** - *

The name of the prop that provides the Airtable table ID

- */ - NameStage tableIdProp(@NotNull String tableIdProp); - - Builder from(ConfigurablePropAirtableViewId other); - } - public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ _FinalStage name(@NotNull String name); + + Builder from(ConfigurablePropAirtableViewId other); } public interface _FinalStage { ConfigurablePropAirtableViewId build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + + /** + *

The name of the prop that provides the Airtable table ID

+ */ + _FinalStage tableIdProp(Optional tableIdProp); + + _FinalStage tableIdProp(String tableIdProp); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,9 +309,7 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements TableIdPropStage, NameStage, _FinalStage { - private String tableIdProp; - + public static final class Builder implements NameStage, _FinalStage { private String name; private Optional withLabel = Optional.empty(); @@ -322,6 +330,10 @@ public static final class Builder implements TableIdPropStage, NameStage, _Final private Optional label = Optional.empty(); + private Optional tableIdProp = Optional.empty(); + + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -329,6 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropAirtableViewId other) { + type(other.getType()); tableIdProp(other.getTableIdProp()); name(other.getName()); label(other.getLabel()); @@ -343,18 +356,6 @@ public Builder from(ConfigurablePropAirtableViewId other) { return this; } - /** - *

The name of the prop that provides the Airtable table ID

- *

The name of the prop that provides the Airtable table ID

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

When building configuredProps, make sure to use this field as the key when setting the prop value

*

When building configuredProps, make sure to use this field as the key when setting the prop value

@@ -547,9 +548,43 @@ public _FinalStage label(Optional label) { return this; } + /** + *

The name of the prop that provides the Airtable table ID

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

The name of the prop that provides the Airtable table ID

+ */ + @java.lang.Override + @JsonSetter(value = "tableIdProp", nulls = Nulls.SKIP) + public _FinalStage tableIdProp(Optional tableIdProp) { + this.tableIdProp = tableIdProp; + return this; + } + + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropAirtableViewId build() { return new ConfigurablePropAirtableViewId( + type, tableIdProp, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropAlert.java b/src/main/java/com/pipedream/api/types/ConfigurablePropAlert.java index 188ce32..23b4bb3 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropAlert.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropAlert.java @@ -21,9 +21,11 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropAlert.Builder.class) public final class ConfigurablePropAlert { + private final Optional type; + private final Optional alertType; - private final String content; + private final Optional content; private final String name; @@ -48,8 +50,9 @@ public final class ConfigurablePropAlert { private final Map additionalProperties; private ConfigurablePropAlert( + Optional type, Optional alertType, - String content, + Optional content, String name, Optional label, Optional description, @@ -61,6 +64,7 @@ private ConfigurablePropAlert( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.alertType = alertType; this.content = content; this.name = name; @@ -77,8 +81,8 @@ private ConfigurablePropAlert( } @JsonProperty("type") - public String getType() { - return "alert"; + public Optional getType() { + return type; } @JsonProperty("alertType") @@ -90,7 +94,7 @@ public Optional getAlertType() { * @return The content of the alert, which can include HTML or plain text. */ @JsonProperty("content") - public String getContent() { + public Optional getContent() { return content; } @@ -186,7 +190,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropAlert other) { - return alertType.equals(other.alertType) + return type.equals(other.type) + && alertType.equals(other.alertType) && content.equals(other.content) && name.equals(other.name) && label.equals(other.label) @@ -203,6 +208,7 @@ private boolean equalTo(ConfigurablePropAlert other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.alertType, this.content, this.name, @@ -222,33 +228,37 @@ public String toString() { return ObjectMappers.stringify(this); } - public static ContentStage builder() { + public static NameStage builder() { return new Builder(); } - public interface ContentStage { - /** - *

The content of the alert, which can include HTML or plain text.

- */ - NameStage content(@NotNull String content); - - Builder from(ConfigurablePropAlert other); - } - public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ _FinalStage name(@NotNull String name); + + Builder from(ConfigurablePropAlert other); } public interface _FinalStage { ConfigurablePropAlert build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + _FinalStage alertType(Optional alertType); _FinalStage alertType(ConfigurablePropAlertType alertType); + /** + *

The content of the alert, which can include HTML or plain text.

+ */ + _FinalStage content(Optional content); + + _FinalStage content(String content); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -314,9 +324,7 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements ContentStage, NameStage, _FinalStage { - private String content; - + public static final class Builder implements NameStage, _FinalStage { private String name; private Optional withLabel = Optional.empty(); @@ -337,8 +345,12 @@ public static final class Builder implements ContentStage, NameStage, _FinalStag private Optional label = Optional.empty(); + private Optional content = Optional.empty(); + private Optional alertType = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -346,6 +358,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropAlert other) { + type(other.getType()); alertType(other.getAlertType()); content(other.getContent()); name(other.getName()); @@ -361,18 +374,6 @@ public Builder from(ConfigurablePropAlert other) { return this; } - /** - *

The content of the alert, which can include HTML or plain text.

- *

The content of the alert, which can include HTML or plain text.

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

When building configuredProps, make sure to use this field as the key when setting the prop value

*

When building configuredProps, make sure to use this field as the key when setting the prop value

@@ -565,6 +566,26 @@ public _FinalStage label(Optional label) { return this; } + /** + *

The content of the alert, which can include HTML or plain text.

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

The content of the alert, which can include HTML or plain text.

+ */ + @java.lang.Override + @JsonSetter(value = "content", nulls = Nulls.SKIP) + public _FinalStage content(Optional content) { + this.content = content; + return this; + } + @java.lang.Override public _FinalStage alertType(ConfigurablePropAlertType alertType) { this.alertType = Optional.ofNullable(alertType); @@ -578,9 +599,23 @@ public _FinalStage alertType(Optional alertType) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropAlert build() { return new ConfigurablePropAlert( + type, alertType, content, name, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropAny.java b/src/main/java/com/pipedream/api/types/ConfigurablePropAny.java index 7794f21..caff2b5 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropAny.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropAny.java @@ -21,6 +21,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropAny.Builder.class) public final class ConfigurablePropAny { + private final Optional type; + private final String name; private final Optional label; @@ -44,6 +46,7 @@ public final class ConfigurablePropAny { private final Map additionalProperties; private ConfigurablePropAny( + Optional type, String name, Optional label, Optional description, @@ -55,6 +58,7 @@ private ConfigurablePropAny( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.name = name; this.label = label; this.description = description; @@ -69,8 +73,8 @@ private ConfigurablePropAny( } @JsonProperty("type") - public String getType() { - return "any"; + public Optional getType() { + return type; } /** @@ -165,7 +169,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropAny other) { - return name.equals(other.name) + return type.equals(other.type) + && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) && optional.equals(other.optional) @@ -180,6 +185,7 @@ private boolean equalTo(ConfigurablePropAny other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.name, this.label, this.description, @@ -213,6 +219,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropAny build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,6 +309,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional label = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -306,6 +318,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropAny other) { + type(other.getType()); name(other.getName()); label(other.getLabel()); description(other.getDescription()); @@ -511,9 +524,23 @@ public _FinalStage label(Optional label) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropAny build() { return new ConfigurablePropAny( + type, name, label, description, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropApp.java b/src/main/java/com/pipedream/api/types/ConfigurablePropApp.java index 3b71506..abe1111 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropApp.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropApp.java @@ -21,7 +21,9 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropApp.Builder.class) public final class ConfigurablePropApp { - private final String app; + private final Optional type; + + private final Optional app; private final String name; @@ -46,7 +48,8 @@ public final class ConfigurablePropApp { private final Map additionalProperties; private ConfigurablePropApp( - String app, + Optional type, + Optional app, String name, Optional label, Optional description, @@ -58,6 +61,7 @@ private ConfigurablePropApp( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.app = app; this.name = name; this.label = label; @@ -73,15 +77,15 @@ private ConfigurablePropApp( } @JsonProperty("type") - public String getType() { - return "app"; + public Optional getType() { + return type; } /** * @return The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured. */ @JsonProperty("app") - public String getApp() { + public Optional getApp() { return app; } @@ -177,7 +181,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropApp other) { - return app.equals(other.app) + return type.equals(other.type) + && app.equals(other.app) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -193,6 +198,7 @@ private boolean equalTo(ConfigurablePropApp other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.app, this.name, this.label, @@ -211,29 +217,33 @@ public String toString() { return ObjectMappers.stringify(this); } - public static AppStage builder() { + public static NameStage builder() { return new Builder(); } - public interface AppStage { - /** - *

The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.

- */ - NameStage app(@NotNull String app); - - Builder from(ConfigurablePropApp other); - } - public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ _FinalStage name(@NotNull String name); + + Builder from(ConfigurablePropApp other); } public interface _FinalStage { ConfigurablePropApp build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + + /** + *

The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.

+ */ + _FinalStage app(Optional app); + + _FinalStage app(String app); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,9 +309,7 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements AppStage, NameStage, _FinalStage { - private String app; - + public static final class Builder implements NameStage, _FinalStage { private String name; private Optional withLabel = Optional.empty(); @@ -322,6 +330,10 @@ public static final class Builder implements AppStage, NameStage, _FinalStage { private Optional label = Optional.empty(); + private Optional app = Optional.empty(); + + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -329,6 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropApp other) { + type(other.getType()); app(other.getApp()); name(other.getName()); label(other.getLabel()); @@ -343,18 +356,6 @@ public Builder from(ConfigurablePropApp other) { return this; } - /** - *

The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.

- *

The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.

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

When building configuredProps, make sure to use this field as the key when setting the prop value

*

When building configuredProps, make sure to use this field as the key when setting the prop value

@@ -547,9 +548,43 @@ public _FinalStage label(Optional label) { return this; } + /** + *

The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.

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

The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.

+ */ + @java.lang.Override + @JsonSetter(value = "app", nulls = Nulls.SKIP) + public _FinalStage app(Optional app) { + this.app = app; + return this; + } + + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropApp build() { return new ConfigurablePropApp( + type, app, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropApphook.java b/src/main/java/com/pipedream/api/types/ConfigurablePropApphook.java index fbfd3f7..1c0f74c 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropApphook.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropApphook.java @@ -22,7 +22,9 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropApphook.Builder.class) public final class ConfigurablePropApphook { - private final String appProp; + private final Optional type; + + private final Optional appProp; private final Optional> eventNames; @@ -53,7 +55,8 @@ public final class ConfigurablePropApphook { private final Map additionalProperties; private ConfigurablePropApphook( - String appProp, + Optional type, + Optional appProp, Optional> eventNames, Optional remote, Optional> static_, @@ -68,6 +71,7 @@ private ConfigurablePropApphook( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.appProp = appProp; this.eventNames = eventNames; this.remote = remote; @@ -86,15 +90,15 @@ private ConfigurablePropApphook( } @JsonProperty("type") - public String getType() { - return "$.interface.apphook"; + public Optional getType() { + return type; } /** * @return The name of the app prop that this apphook depends on */ @JsonProperty("appProp") - public String getAppProp() { + public Optional getAppProp() { return appProp; } @@ -214,7 +218,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropApphook other) { - return appProp.equals(other.appProp) + return type.equals(other.type) + && appProp.equals(other.appProp) && eventNames.equals(other.eventNames) && remote.equals(other.remote) && static_.equals(other.static_) @@ -233,6 +238,7 @@ private boolean equalTo(ConfigurablePropApphook other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.appProp, this.eventNames, this.remote, @@ -254,29 +260,33 @@ public String toString() { return ObjectMappers.stringify(this); } - public static AppPropStage builder() { + public static NameStage builder() { return new Builder(); } - public interface AppPropStage { - /** - *

The name of the app prop that this apphook depends on

- */ - NameStage appProp(@NotNull String appProp); - - Builder from(ConfigurablePropApphook other); - } - public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ _FinalStage name(@NotNull String name); + + Builder from(ConfigurablePropApphook other); } public interface _FinalStage { ConfigurablePropApphook build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + + /** + *

The name of the app prop that this apphook depends on

+ */ + _FinalStage appProp(Optional appProp); + + _FinalStage appProp(String appProp); + /** *

List of event names to listen for

*/ @@ -363,9 +373,7 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements AppPropStage, NameStage, _FinalStage { - private String appProp; - + public static final class Builder implements NameStage, _FinalStage { private String name; private Optional withLabel = Optional.empty(); @@ -392,6 +400,10 @@ public static final class Builder implements AppPropStage, NameStage, _FinalStag private Optional> eventNames = Optional.empty(); + private Optional appProp = Optional.empty(); + + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -399,6 +411,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropApphook other) { + type(other.getType()); appProp(other.getAppProp()); eventNames(other.getEventNames()); remote(other.getRemote()); @@ -416,18 +429,6 @@ public Builder from(ConfigurablePropApphook other) { return this; } - /** - *

The name of the app prop that this apphook depends on

- *

The name of the app prop that this apphook depends on

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

When building configuredProps, make sure to use this field as the key when setting the prop value

*

When building configuredProps, make sure to use this field as the key when setting the prop value

@@ -680,9 +681,43 @@ public _FinalStage eventNames(Optional> eventNames) { return this; } + /** + *

The name of the app prop that this apphook depends on

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

The name of the app prop that this apphook depends on

+ */ + @java.lang.Override + @JsonSetter(value = "appProp", nulls = Nulls.SKIP) + public _FinalStage appProp(Optional appProp) { + this.appProp = appProp; + return this; + } + + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropApphook build() { return new ConfigurablePropApphook( + type, appProp, eventNames, remote, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropBoolean.java b/src/main/java/com/pipedream/api/types/ConfigurablePropBoolean.java index cd662cc..219b5c7 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropBoolean.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropBoolean.java @@ -21,7 +21,7 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropBoolean.Builder.class) public final class ConfigurablePropBoolean { - private final Optional default_; + private final Optional type; private final String name; @@ -46,7 +46,7 @@ public final class ConfigurablePropBoolean { private final Map additionalProperties; private ConfigurablePropBoolean( - Optional default_, + Optional type, String name, Optional label, Optional description, @@ -58,7 +58,7 @@ private ConfigurablePropBoolean( Optional reloadProps, Optional withLabel, Map additionalProperties) { - this.default_ = default_; + this.type = type; this.name = name; this.label = label; this.description = description; @@ -73,16 +73,8 @@ private ConfigurablePropBoolean( } @JsonProperty("type") - public String getType() { - return "boolean"; - } - - /** - * @return The default value for this prop - */ - @JsonProperty("default") - public Optional getDefault() { - return default_; + public Optional getType() { + return type; } /** @@ -177,7 +169,7 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropBoolean other) { - return default_.equals(other.default_) + return type.equals(other.type) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -193,7 +185,7 @@ private boolean equalTo(ConfigurablePropBoolean other) { @java.lang.Override public int hashCode() { return Objects.hash( - this.default_, + this.type, this.name, this.label, this.description, @@ -227,12 +219,9 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropBoolean build(); - /** - *

The default value for this prop

- */ - _FinalStage default_(Optional default_); + _FinalStage type(Optional type); - _FinalStage default_(Boolean default_); + _FinalStage type(String type); /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

@@ -320,7 +309,7 @@ public static final class Builder implements NameStage, _FinalStage { private Optional label = Optional.empty(); - private Optional default_ = Optional.empty(); + private Optional type = Optional.empty(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -329,7 +318,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropBoolean other) { - default_(other.getDefault()); + type(other.getType()); name(other.getName()); label(other.getLabel()); description(other.getDescription()); @@ -535,30 +524,23 @@ public _FinalStage label(Optional label) { return this; } - /** - *

The default value for this prop

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

The default value for this prop

- */ @java.lang.Override - @JsonSetter(value = "default", nulls = Nulls.SKIP) - public _FinalStage default_(Optional default_) { - this.default_ = default_; + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; return this; } @java.lang.Override public ConfigurablePropBoolean build() { return new ConfigurablePropBoolean( - default_, + type, name, label, description, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropDb.java b/src/main/java/com/pipedream/api/types/ConfigurablePropDb.java index e66e9bf..355010f 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropDb.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropDb.java @@ -21,6 +21,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropDb.Builder.class) public final class ConfigurablePropDb { + private final Optional type; + private final String name; private final Optional label; @@ -44,6 +46,7 @@ public final class ConfigurablePropDb { private final Map additionalProperties; private ConfigurablePropDb( + Optional type, String name, Optional label, Optional description, @@ -55,6 +58,7 @@ private ConfigurablePropDb( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.name = name; this.label = label; this.description = description; @@ -69,8 +73,8 @@ private ConfigurablePropDb( } @JsonProperty("type") - public String getType() { - return "$.service.db"; + public Optional getType() { + return type; } /** @@ -165,7 +169,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropDb other) { - return name.equals(other.name) + return type.equals(other.type) + && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) && optional.equals(other.optional) @@ -180,6 +185,7 @@ private boolean equalTo(ConfigurablePropDb other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.name, this.label, this.description, @@ -213,6 +219,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropDb build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,6 +309,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional label = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -306,6 +318,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropDb other) { + type(other.getType()); name(other.getName()); label(other.getLabel()); description(other.getDescription()); @@ -511,9 +524,23 @@ public _FinalStage label(Optional label) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropDb build() { return new ConfigurablePropDb( + type, name, label, description, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropDiscord.java b/src/main/java/com/pipedream/api/types/ConfigurablePropDiscord.java index 456b93e..6dbf7ec 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropDiscord.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropDiscord.java @@ -21,6 +21,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropDiscord.Builder.class) public final class ConfigurablePropDiscord { + private final Optional type; + private final String name; private final Optional label; @@ -44,6 +46,7 @@ public final class ConfigurablePropDiscord { private final Map additionalProperties; private ConfigurablePropDiscord( + Optional type, String name, Optional label, Optional description, @@ -55,6 +58,7 @@ private ConfigurablePropDiscord( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.name = name; this.label = label; this.description = description; @@ -69,8 +73,8 @@ private ConfigurablePropDiscord( } @JsonProperty("type") - public String getType() { - return "$.discord.channel"; + public Optional getType() { + return type; } /** @@ -165,7 +169,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropDiscord other) { - return name.equals(other.name) + return type.equals(other.type) + && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) && optional.equals(other.optional) @@ -180,6 +185,7 @@ private boolean equalTo(ConfigurablePropDiscord other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.name, this.label, this.description, @@ -213,6 +219,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropDiscord build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,6 +309,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional label = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -306,6 +318,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropDiscord other) { + type(other.getType()); name(other.getName()); label(other.getLabel()); description(other.getDescription()); @@ -511,9 +524,23 @@ public _FinalStage label(Optional label) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropDiscord build() { return new ConfigurablePropDiscord( + type, name, label, description, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropDiscordChannel.java b/src/main/java/com/pipedream/api/types/ConfigurablePropDiscordChannel.java index daae542..3eb0836 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropDiscordChannel.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropDiscordChannel.java @@ -21,7 +21,9 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropDiscordChannel.Builder.class) public final class ConfigurablePropDiscordChannel { - private final String appProp; + private final Optional type; + + private final Optional appProp; private final String name; @@ -46,7 +48,8 @@ public final class ConfigurablePropDiscordChannel { private final Map additionalProperties; private ConfigurablePropDiscordChannel( - String appProp, + Optional type, + Optional appProp, String name, Optional label, Optional description, @@ -58,6 +61,7 @@ private ConfigurablePropDiscordChannel( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.appProp = appProp; this.name = name; this.label = label; @@ -73,15 +77,15 @@ private ConfigurablePropDiscordChannel( } @JsonProperty("type") - public String getType() { - return "$.discord.channel"; + public Optional getType() { + return type; } /** * @return The name of the app prop that provides Discord authentication */ @JsonProperty("appProp") - public String getAppProp() { + public Optional getAppProp() { return appProp; } @@ -177,7 +181,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropDiscordChannel other) { - return appProp.equals(other.appProp) + return type.equals(other.type) + && appProp.equals(other.appProp) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -193,6 +198,7 @@ private boolean equalTo(ConfigurablePropDiscordChannel other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.appProp, this.name, this.label, @@ -211,29 +217,33 @@ public String toString() { return ObjectMappers.stringify(this); } - public static AppPropStage builder() { + public static NameStage builder() { return new Builder(); } - public interface AppPropStage { - /** - *

The name of the app prop that provides Discord authentication

- */ - NameStage appProp(@NotNull String appProp); - - Builder from(ConfigurablePropDiscordChannel other); - } - public interface NameStage { /** *

When building configuredProps, make sure to use this field as the key when setting the prop value

*/ _FinalStage name(@NotNull String name); + + Builder from(ConfigurablePropDiscordChannel other); } public interface _FinalStage { ConfigurablePropDiscordChannel build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + + /** + *

The name of the app prop that provides Discord authentication

+ */ + _FinalStage appProp(Optional appProp); + + _FinalStage appProp(String appProp); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,9 +309,7 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements AppPropStage, NameStage, _FinalStage { - private String appProp; - + public static final class Builder implements NameStage, _FinalStage { private String name; private Optional withLabel = Optional.empty(); @@ -322,6 +330,10 @@ public static final class Builder implements AppPropStage, NameStage, _FinalStag private Optional label = Optional.empty(); + private Optional appProp = Optional.empty(); + + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -329,6 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropDiscordChannel other) { + type(other.getType()); appProp(other.getAppProp()); name(other.getName()); label(other.getLabel()); @@ -343,18 +356,6 @@ public Builder from(ConfigurablePropDiscordChannel other) { return this; } - /** - *

The name of the app prop that provides Discord authentication

- *

The name of the app prop that provides Discord authentication

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

When building configuredProps, make sure to use this field as the key when setting the prop value

*

When building configuredProps, make sure to use this field as the key when setting the prop value

@@ -547,9 +548,43 @@ public _FinalStage label(Optional label) { return this; } + /** + *

The name of the app prop that provides Discord authentication

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

The name of the app prop that provides Discord authentication

+ */ + @java.lang.Override + @JsonSetter(value = "appProp", nulls = Nulls.SKIP) + public _FinalStage appProp(Optional appProp) { + this.appProp = appProp; + return this; + } + + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropDiscordChannel build() { return new ConfigurablePropDiscordChannel( + type, appProp, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropDiscordChannelArray.java b/src/main/java/com/pipedream/api/types/ConfigurablePropDiscordChannelArray.java index 240c7bd..d2d6eaf 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropDiscordChannelArray.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropDiscordChannelArray.java @@ -21,6 +21,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropDiscordChannelArray.Builder.class) public final class ConfigurablePropDiscordChannelArray { + private final Optional type; + private final Optional appProp; private final String name; @@ -46,6 +48,7 @@ public final class ConfigurablePropDiscordChannelArray { private final Map additionalProperties; private ConfigurablePropDiscordChannelArray( + Optional type, Optional appProp, String name, Optional label, @@ -58,6 +61,7 @@ private ConfigurablePropDiscordChannelArray( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.appProp = appProp; this.name = name; this.label = label; @@ -73,8 +77,8 @@ private ConfigurablePropDiscordChannelArray( } @JsonProperty("type") - public String getType() { - return "$.discord.channel[]"; + public Optional getType() { + return type; } /** @@ -178,7 +182,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropDiscordChannelArray other) { - return appProp.equals(other.appProp) + return type.equals(other.type) + && appProp.equals(other.appProp) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -194,6 +199,7 @@ private boolean equalTo(ConfigurablePropDiscordChannelArray other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.appProp, this.name, this.label, @@ -228,6 +234,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropDiscordChannelArray build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

The name of the app prop that provides Discord authentication

*/ @@ -323,6 +333,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional appProp = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -330,6 +342,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropDiscordChannelArray other) { + type(other.getType()); appProp(other.getAppProp()); name(other.getName()); label(other.getLabel()); @@ -556,9 +569,23 @@ public _FinalStage appProp(Optional appProp) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropDiscordChannelArray build() { return new ConfigurablePropDiscordChannelArray( + type, appProp, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropHttp.java b/src/main/java/com/pipedream/api/types/ConfigurablePropHttp.java index 18c009b..44dc3ba 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropHttp.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropHttp.java @@ -21,6 +21,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropHttp.Builder.class) public final class ConfigurablePropHttp { + private final Optional type; + private final Optional customResponse; private final String name; @@ -46,6 +48,7 @@ public final class ConfigurablePropHttp { private final Map additionalProperties; private ConfigurablePropHttp( + Optional type, Optional customResponse, String name, Optional label, @@ -58,6 +61,7 @@ private ConfigurablePropHttp( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.customResponse = customResponse; this.name = name; this.label = label; @@ -73,8 +77,8 @@ private ConfigurablePropHttp( } @JsonProperty("type") - public String getType() { - return "$.interface.http"; + public Optional getType() { + return type; } /** @@ -177,7 +181,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropHttp other) { - return customResponse.equals(other.customResponse) + return type.equals(other.type) + && customResponse.equals(other.customResponse) && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) @@ -193,6 +198,7 @@ private boolean equalTo(ConfigurablePropHttp other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.customResponse, this.name, this.label, @@ -227,6 +233,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropHttp build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

Whether this HTTP interface allows custom responses

*/ @@ -322,6 +332,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional customResponse = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -329,6 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropHttp other) { + type(other.getType()); customResponse(other.getCustomResponse()); name(other.getName()); label(other.getLabel()); @@ -555,9 +568,23 @@ public _FinalStage customResponse(Optional customResponse) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropHttp build() { return new ConfigurablePropHttp( + type, customResponse, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropInteger.java b/src/main/java/com/pipedream/api/types/ConfigurablePropInteger.java index e50a3b4..9d99f7e 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropInteger.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropInteger.java @@ -22,6 +22,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropInteger.Builder.class) public final class ConfigurablePropInteger { + private final Optional type; + private final Optional min; private final Optional max; @@ -53,6 +55,7 @@ public final class ConfigurablePropInteger { private final Map additionalProperties; private ConfigurablePropInteger( + Optional type, Optional min, Optional max, Optional default_, @@ -68,6 +71,7 @@ private ConfigurablePropInteger( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.min = min; this.max = max; this.default_ = default_; @@ -86,8 +90,8 @@ private ConfigurablePropInteger( } @JsonProperty("type") - public String getType() { - return "integer"; + public Optional getType() { + return type; } /** @@ -214,7 +218,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropInteger other) { - return min.equals(other.min) + return type.equals(other.type) + && min.equals(other.min) && max.equals(other.max) && default_.equals(other.default_) && options.equals(other.options) @@ -233,6 +238,7 @@ private boolean equalTo(ConfigurablePropInteger other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.min, this.max, this.default_, @@ -270,6 +276,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropInteger build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

The minimum value for this integer prop.

*/ @@ -392,6 +402,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional min = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -399,6 +411,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropInteger other) { + type(other.getType()); min(other.getMin()); max(other.getMax()); default_(other.getDefault()); @@ -688,9 +701,23 @@ public _FinalStage min(Optional min) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropInteger build() { return new ConfigurablePropInteger( + type, min, max, default_, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropIntegerArray.java b/src/main/java/com/pipedream/api/types/ConfigurablePropIntegerArray.java index 1dd3ce0..1584e9e 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropIntegerArray.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropIntegerArray.java @@ -22,6 +22,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropIntegerArray.Builder.class) public final class ConfigurablePropIntegerArray { + private final Optional type; + private final Optional min; private final Optional max; @@ -53,6 +55,7 @@ public final class ConfigurablePropIntegerArray { private final Map additionalProperties; private ConfigurablePropIntegerArray( + Optional type, Optional min, Optional max, Optional> default_, @@ -68,6 +71,7 @@ private ConfigurablePropIntegerArray( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.min = min; this.max = max; this.default_ = default_; @@ -86,8 +90,8 @@ private ConfigurablePropIntegerArray( } @JsonProperty("type") - public String getType() { - return "integer[]"; + public Optional getType() { + return type; } /** @@ -214,7 +218,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropIntegerArray other) { - return min.equals(other.min) + return type.equals(other.type) + && min.equals(other.min) && max.equals(other.max) && default_.equals(other.default_) && options.equals(other.options) @@ -233,6 +238,7 @@ private boolean equalTo(ConfigurablePropIntegerArray other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.min, this.max, this.default_, @@ -270,6 +276,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropIntegerArray build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

The minimum value for integers in this array

*/ @@ -392,6 +402,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional min = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -399,6 +411,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropIntegerArray other) { + type(other.getType()); min(other.getMin()); max(other.getMax()); default_(other.getDefault()); @@ -688,9 +701,23 @@ public _FinalStage min(Optional min) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropIntegerArray build() { return new ConfigurablePropIntegerArray( + type, min, max, default_, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropObject.java b/src/main/java/com/pipedream/api/types/ConfigurablePropObject.java index d6aa6f6..e405fca 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropObject.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropObject.java @@ -21,6 +21,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropObject.Builder.class) public final class ConfigurablePropObject { + private final Optional type; + private final String name; private final Optional label; @@ -44,6 +46,7 @@ public final class ConfigurablePropObject { private final Map additionalProperties; private ConfigurablePropObject( + Optional type, String name, Optional label, Optional description, @@ -55,6 +58,7 @@ private ConfigurablePropObject( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.name = name; this.label = label; this.description = description; @@ -69,8 +73,8 @@ private ConfigurablePropObject( } @JsonProperty("type") - public String getType() { - return "object"; + public Optional getType() { + return type; } /** @@ -165,7 +169,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropObject other) { - return name.equals(other.name) + return type.equals(other.type) + && name.equals(other.name) && label.equals(other.label) && description.equals(other.description) && optional.equals(other.optional) @@ -180,6 +185,7 @@ private boolean equalTo(ConfigurablePropObject other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.name, this.label, this.description, @@ -213,6 +219,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropObject build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + /** *

Value to use as an input label. In cases where type is "app", should load the app via getApp, etc. and show app.name instead.

*/ @@ -299,6 +309,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional label = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -306,6 +318,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropObject other) { + type(other.getType()); name(other.getName()); label(other.getLabel()); description(other.getDescription()); @@ -511,9 +524,23 @@ public _FinalStage label(Optional label) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropObject build() { return new ConfigurablePropObject( + type, name, label, description, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropSql.java b/src/main/java/com/pipedream/api/types/ConfigurablePropSql.java index d0305aa..94fccd1 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropSql.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropSql.java @@ -21,6 +21,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropSql.Builder.class) public final class ConfigurablePropSql { + private final Optional type; + private final Optional auth; private final Optional default_; @@ -48,6 +50,7 @@ public final class ConfigurablePropSql { private final Map additionalProperties; private ConfigurablePropSql( + Optional type, Optional auth, Optional default_, String name, @@ -61,6 +64,7 @@ private ConfigurablePropSql( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.auth = auth; this.default_ = default_; this.name = name; @@ -77,8 +81,8 @@ private ConfigurablePropSql( } @JsonProperty("type") - public String getType() { - return "sql"; + public Optional getType() { + return type; } @JsonProperty("auth") @@ -186,7 +190,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropSql other) { - return auth.equals(other.auth) + return type.equals(other.type) + && auth.equals(other.auth) && default_.equals(other.default_) && name.equals(other.name) && label.equals(other.label) @@ -203,6 +208,7 @@ private boolean equalTo(ConfigurablePropSql other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.auth, this.default_, this.name, @@ -238,6 +244,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropSql build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + _FinalStage auth(Optional auth); _FinalStage auth(ConfigurablePropSqlAuth auth); @@ -339,6 +349,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional auth = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -346,6 +358,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropSql other) { + type(other.getType()); auth(other.getAuth()); default_(other.getDefault()); name(other.getName()); @@ -586,9 +599,23 @@ public _FinalStage auth(Optional auth) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropSql build() { return new ConfigurablePropSql( + type, auth, default_, name, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropString.java b/src/main/java/com/pipedream/api/types/ConfigurablePropString.java index 1fe3aa0..7347504 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropString.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropString.java @@ -21,7 +21,7 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropString.Builder.class) public final class ConfigurablePropString { - private final Optional default_; + private final Optional type; private final Optional secret; @@ -48,7 +48,7 @@ public final class ConfigurablePropString { private final Map additionalProperties; private ConfigurablePropString( - Optional default_, + Optional type, Optional secret, String name, Optional label, @@ -61,7 +61,7 @@ private ConfigurablePropString( Optional reloadProps, Optional withLabel, Map additionalProperties) { - this.default_ = default_; + this.type = type; this.secret = secret; this.name = name; this.label = label; @@ -77,16 +77,8 @@ private ConfigurablePropString( } @JsonProperty("type") - public String getType() { - return "string"; - } - - /** - * @return The default value for this prop - */ - @JsonProperty("default") - public Optional getDefault() { - return default_; + public Optional getType() { + return type; } /** @@ -189,7 +181,7 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropString other) { - return default_.equals(other.default_) + return type.equals(other.type) && secret.equals(other.secret) && name.equals(other.name) && label.equals(other.label) @@ -206,7 +198,7 @@ private boolean equalTo(ConfigurablePropString other) { @java.lang.Override public int hashCode() { return Objects.hash( - this.default_, + this.type, this.secret, this.name, this.label, @@ -241,12 +233,9 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropString build(); - /** - *

The default value for this prop

- */ - _FinalStage default_(Optional default_); + _FinalStage type(Optional type); - _FinalStage default_(String default_); + _FinalStage type(String type); /** *

If true, this prop is a secret and should not be displayed in plain text.

@@ -343,7 +332,7 @@ public static final class Builder implements NameStage, _FinalStage { private Optional secret = Optional.empty(); - private Optional default_ = Optional.empty(); + private Optional type = Optional.empty(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -352,7 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropString other) { - default_(other.getDefault()); + type(other.getType()); secret(other.getSecret()); name(other.getName()); label(other.getLabel()); @@ -579,30 +568,23 @@ public _FinalStage secret(Optional secret) { return this; } - /** - *

The default value for this prop

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

The default value for this prop

- */ @java.lang.Override - @JsonSetter(value = "default", nulls = Nulls.SKIP) - public _FinalStage default_(Optional default_) { - this.default_ = default_; + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; return this; } @java.lang.Override public ConfigurablePropString build() { return new ConfigurablePropString( - default_, + type, secret, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropStringArray.java b/src/main/java/com/pipedream/api/types/ConfigurablePropStringArray.java index 60d782c..4708211 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropStringArray.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropStringArray.java @@ -13,7 +13,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.pipedream.api.core.ObjectMappers; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -22,7 +21,7 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropStringArray.Builder.class) public final class ConfigurablePropStringArray { - private final Optional> default_; + private final Optional type; private final Optional secret; @@ -49,7 +48,7 @@ public final class ConfigurablePropStringArray { private final Map additionalProperties; private ConfigurablePropStringArray( - Optional> default_, + Optional type, Optional secret, String name, Optional label, @@ -62,7 +61,7 @@ private ConfigurablePropStringArray( Optional reloadProps, Optional withLabel, Map additionalProperties) { - this.default_ = default_; + this.type = type; this.secret = secret; this.name = name; this.label = label; @@ -78,16 +77,8 @@ private ConfigurablePropStringArray( } @JsonProperty("type") - public String getType() { - return "string[]"; - } - - /** - * @return The default value for this prop - */ - @JsonProperty("default") - public Optional> getDefault() { - return default_; + public Optional getType() { + return type; } /** @@ -190,7 +181,7 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropStringArray other) { - return default_.equals(other.default_) + return type.equals(other.type) && secret.equals(other.secret) && name.equals(other.name) && label.equals(other.label) @@ -207,7 +198,7 @@ private boolean equalTo(ConfigurablePropStringArray other) { @java.lang.Override public int hashCode() { return Objects.hash( - this.default_, + this.type, this.secret, this.name, this.label, @@ -242,12 +233,9 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropStringArray build(); - /** - *

The default value for this prop

- */ - _FinalStage default_(Optional> default_); + _FinalStage type(Optional type); - _FinalStage default_(List default_); + _FinalStage type(String type); /** *

If true, this prop is a secret and should not be displayed in plain text.

@@ -344,7 +332,7 @@ public static final class Builder implements NameStage, _FinalStage { private Optional secret = Optional.empty(); - private Optional> default_ = Optional.empty(); + private Optional type = Optional.empty(); @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -353,7 +341,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropStringArray other) { - default_(other.getDefault()); + type(other.getType()); secret(other.getSecret()); name(other.getName()); label(other.getLabel()); @@ -580,30 +568,23 @@ public _FinalStage secret(Optional secret) { return this; } - /** - *

The default value for this prop

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

The default value for this prop

- */ @java.lang.Override - @JsonSetter(value = "default", nulls = Nulls.SKIP) - public _FinalStage default_(Optional> default_) { - this.default_ = default_; + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; return this; } @java.lang.Override public ConfigurablePropStringArray build() { return new ConfigurablePropStringArray( - default_, + type, secret, name, label, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropTimer.java b/src/main/java/com/pipedream/api/types/ConfigurablePropTimer.java index 91e02c9..ebd8329 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropTimer.java +++ b/src/main/java/com/pipedream/api/types/ConfigurablePropTimer.java @@ -22,6 +22,8 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurablePropTimer.Builder.class) public final class ConfigurablePropTimer { + private final Optional type; + private final Optional static_; private final Optional default_; @@ -51,6 +53,7 @@ public final class ConfigurablePropTimer { private final Map additionalProperties; private ConfigurablePropTimer( + Optional type, Optional static_, Optional default_, Optional>> options, @@ -65,6 +68,7 @@ private ConfigurablePropTimer( Optional reloadProps, Optional withLabel, Map additionalProperties) { + this.type = type; this.static_ = static_; this.default_ = default_; this.options = options; @@ -82,8 +86,8 @@ private ConfigurablePropTimer( } @JsonProperty("type") - public String getType() { - return "$.interface.timer"; + public Optional getType() { + return type; } @JsonProperty("static") @@ -196,7 +200,8 @@ public Map getAdditionalProperties() { } private boolean equalTo(ConfigurablePropTimer other) { - return static_.equals(other.static_) + return type.equals(other.type) + && static_.equals(other.static_) && default_.equals(other.default_) && options.equals(other.options) && name.equals(other.name) @@ -214,6 +219,7 @@ private boolean equalTo(ConfigurablePropTimer other) { @java.lang.Override public int hashCode() { return Objects.hash( + this.type, this.static_, this.default_, this.options, @@ -250,6 +256,10 @@ public interface NameStage { public interface _FinalStage { ConfigurablePropTimer build(); + _FinalStage type(Optional type); + + _FinalStage type(String type); + _FinalStage static_(Optional static_); _FinalStage static_(ConfigurablePropTimerStatic static_); @@ -357,6 +367,8 @@ public static final class Builder implements NameStage, _FinalStage { private Optional static_ = Optional.empty(); + private Optional type = Optional.empty(); + @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -364,6 +376,7 @@ private Builder() {} @java.lang.Override public Builder from(ConfigurablePropTimer other) { + type(other.getType()); static_(other.getStatic()); default_(other.getDefault()); options(other.getOptions()); @@ -618,9 +631,23 @@ public _FinalStage static_(Optional static_) { return this; } + @java.lang.Override + public _FinalStage type(String type) { + this.type = Optional.ofNullable(type); + return this; + } + + @java.lang.Override + @JsonSetter(value = "type", nulls = Nulls.SKIP) + public _FinalStage type(Optional type) { + this.type = type; + return this; + } + @java.lang.Override public ConfigurablePropTimer build() { return new ConfigurablePropTimer( + type, static_, default_, options, diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropType.java b/src/main/java/com/pipedream/api/types/ConfigurablePropType.java deleted file mode 100644 index ed58e25..0000000 --- a/src/main/java/com/pipedream/api/types/ConfigurablePropType.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.types; - -import com.fasterxml.jackson.annotation.JsonValue; - -public enum ConfigurablePropType { - AIRTABLE_BASE_ID("$.airtable.baseId"), - - AIRTABLE_FIELD_ID("$.airtable.fieldId"), - - AIRTABLE_TABLE_ID("$.airtable.tableId"), - - AIRTABLE_VIEW_ID("$.airtable.viewId"), - - DISCORD_CHANNEL("$.discord.channel"), - - DISCORD_CHANNEL_ARRAY("$.discord.channel[]"), - - INTERFACE_APPHOOK("$.interface.apphook"), - - INTERFACE_HTTP("$.interface.http"), - - INTERFACE_TIMER("$.interface.timer"), - - SERVICE_DB("$.service.db"), - - ALERT("alert"), - - ANY("any"), - - APP("app"), - - BOOLEAN("boolean"), - - DATA_STORE("data_store"), - - DIR("dir"), - - HTTP_REQUEST("http_request"), - - INTEGER("integer"), - - INTEGER_ARRAY("integer[]"), - - OBJECT("object"), - - SQL("sql"), - - STRING("string"), - - STRING_ARRAY("string[]"); - - private final String value; - - ConfigurablePropType(String value) { - this.value = value; - } - - @JsonValue - @java.lang.Override - public String toString() { - return this.value; - } -} diff --git a/src/main/java/com/pipedream/api/types/ConfigurePropOptionsItem.java b/src/main/java/com/pipedream/api/types/ConfigurePropOptionsItem.java deleted file mode 100644 index 929b689..0000000 --- a/src/main/java/com/pipedream/api/types/ConfigurePropOptionsItem.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.types; - -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import com.pipedream.api.core.ObjectMappers; -import java.io.IOException; -import java.util.Objects; - -@JsonDeserialize(using = ConfigurePropOptionsItem.Deserializer.class) -public final class ConfigurePropOptionsItem { - private final Object value; - - private final int type; - - private ConfigurePropOptionsItem(Object value, int type) { - this.value = value; - this.type = type; - } - - @JsonValue - public Object get() { - return this.value; - } - - @SuppressWarnings("unchecked") - public T visit(Visitor visitor) { - if (this.type == 0) { - return visitor.visit((PropOption) this.value); - } else if (this.type == 1) { - return visitor.visit((PropOptionNested) this.value); - } - throw new IllegalStateException("Failed to visit value. This should never happen."); - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof ConfigurePropOptionsItem && equalTo((ConfigurePropOptionsItem) other); - } - - private boolean equalTo(ConfigurePropOptionsItem other) { - return value.equals(other.value); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.value); - } - - @java.lang.Override - public String toString() { - return this.value.toString(); - } - - public static ConfigurePropOptionsItem of(PropOption value) { - return new ConfigurePropOptionsItem(value, 0); - } - - public static ConfigurePropOptionsItem of(PropOptionNested value) { - return new ConfigurePropOptionsItem(value, 1); - } - - public interface Visitor { - T visit(PropOption value); - - T visit(PropOptionNested value); - } - - static final class Deserializer extends StdDeserializer { - Deserializer() { - super(ConfigurePropOptionsItem.class); - } - - @java.lang.Override - public ConfigurePropOptionsItem deserialize(JsonParser p, DeserializationContext context) throws IOException { - Object value = p.readValueAs(Object.class); - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, PropOption.class)); - } catch (RuntimeException e) { - } - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, PropOptionNested.class)); - } catch (RuntimeException e) { - } - throw new JsonParseException(p, "Failed to deserialize"); - } - } -} diff --git a/src/main/java/com/pipedream/api/types/ConfigurePropOpts.java b/src/main/java/com/pipedream/api/types/ConfigurePropOpts.java index 66cfd12..5c94b13 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurePropOpts.java +++ b/src/main/java/com/pipedream/api/types/ConfigurePropOpts.java @@ -29,7 +29,7 @@ public final class ConfigurePropOpts { private final Optional blocking; - private final Optional> configuredProps; + private final Optional> configuredProps; private final Optional dynamicPropsId; @@ -46,7 +46,7 @@ private ConfigurePropOpts( String externalUserId, String propName, Optional blocking, - Optional> configuredProps, + Optional> configuredProps, Optional dynamicPropsId, Optional page, Optional> prevContext, @@ -96,8 +96,11 @@ public Optional getBlocking() { return blocking; } + /** + * @return The configured properties for the component + */ @JsonProperty("configured_props") - public Optional> getConfiguredProps() { + public Optional> getConfiguredProps() { return configuredProps; } @@ -212,9 +215,12 @@ public interface _FinalStage { _FinalStage blocking(Boolean blocking); - _FinalStage configuredProps(Optional> configuredProps); + /** + *

The configured properties for the component

+ */ + _FinalStage configuredProps(Optional> configuredProps); - _FinalStage configuredProps(Map configuredProps); + _FinalStage configuredProps(Map configuredProps); /** *

The ID for dynamic props

@@ -261,7 +267,7 @@ public static final class Builder implements IdStage, ExternalUserIdStage, PropN private Optional dynamicPropsId = Optional.empty(); - private Optional> configuredProps = Optional.empty(); + private Optional> configuredProps = Optional.empty(); private Optional blocking = Optional.empty(); @@ -400,15 +406,22 @@ public _FinalStage dynamicPropsId(Optional dynamicPropsId) { return this; } + /** + *

The configured properties for the component

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

The configured properties for the component

+ */ @java.lang.Override @JsonSetter(value = "configured_props", nulls = Nulls.SKIP) - public _FinalStage configuredProps(Optional> configuredProps) { + public _FinalStage configuredProps(Optional> configuredProps) { this.configuredProps = configuredProps; return this; } diff --git a/src/main/java/com/pipedream/api/types/ConfigurePropResponse.java b/src/main/java/com/pipedream/api/types/ConfigurePropResponse.java index f44af77..51444f7 100644 --- a/src/main/java/com/pipedream/api/types/ConfigurePropResponse.java +++ b/src/main/java/com/pipedream/api/types/ConfigurePropResponse.java @@ -21,11 +21,11 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ConfigurePropResponse.Builder.class) public final class ConfigurePropResponse { - private final Optional> options; + private final Optional> options; private final Optional> stringOptions; - private final Optional> observations; + private final Optional> observations; private final Optional> context; @@ -34,9 +34,9 @@ public final class ConfigurePropResponse { private final Map additionalProperties; private ConfigurePropResponse( - Optional> options, + Optional> options, Optional> stringOptions, - Optional> observations, + Optional> observations, Optional> context, Optional> errors, Map additionalProperties) { @@ -48,8 +48,11 @@ private ConfigurePropResponse( this.additionalProperties = additionalProperties; } + /** + * @return Available options (with labels) for the configured prop + */ @JsonProperty("options") - public Optional> getOptions() { + public Optional> getOptions() { return options; } @@ -61,8 +64,11 @@ public Optional> getStringOptions() { return stringOptions; } + /** + * @return Any logs produced during the configuration of the prop + */ @JsonProperty("observations") - public Optional> getObservations() { + public Optional> getObservations() { return observations; } @@ -117,11 +123,11 @@ public static Builder builder() { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder { - private Optional> options = Optional.empty(); + private Optional> options = Optional.empty(); private Optional> stringOptions = Optional.empty(); - private Optional> observations = Optional.empty(); + private Optional> observations = Optional.empty(); private Optional> context = Optional.empty(); @@ -141,13 +147,16 @@ public Builder from(ConfigurePropResponse other) { return this; } + /** + *

Available options (with labels) for the configured prop

+ */ @JsonSetter(value = "options", nulls = Nulls.SKIP) - public Builder options(Optional> options) { + public Builder options(Optional> options) { this.options = options; return this; } - public Builder options(List options) { + public Builder options(List options) { this.options = Optional.ofNullable(options); return this; } @@ -166,13 +175,16 @@ public Builder stringOptions(List stringOptions) { return this; } + /** + *

Any logs produced during the configuration of the prop

+ */ @JsonSetter(value = "observations", nulls = Nulls.SKIP) - public Builder observations(Optional> observations) { + public Builder observations(Optional> observations) { this.observations = observations; return this; } - public Builder observations(List observations) { + public Builder observations(Map observations) { this.observations = Optional.ofNullable(observations); return this; } diff --git a/src/main/java/com/pipedream/api/types/ConfiguredPropValue.java b/src/main/java/com/pipedream/api/types/ConfiguredPropValue.java deleted file mode 100644 index 1a9c3e4..0000000 --- a/src/main/java/com/pipedream/api/types/ConfiguredPropValue.java +++ /dev/null @@ -1,168 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.types; - -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import com.pipedream.api.core.ObjectMappers; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -@JsonDeserialize(using = ConfiguredPropValue.Deserializer.class) -public final class ConfiguredPropValue { - private final Object value; - - private final int type; - - private ConfiguredPropValue(Object value, int type) { - this.value = value; - this.type = type; - } - - @JsonValue - public Object get() { - return this.value; - } - - @SuppressWarnings("unchecked") - public T visit(Visitor visitor) { - if (this.type == 0) { - return visitor.visit((Object) this.value); - } else if (this.type == 1) { - return visitor.visit((ConfiguredPropValueApp) this.value); - } else if (this.type == 2) { - return visitor.visit((boolean) this.value); - } else if (this.type == 3) { - return visitor.visit((double) this.value); - } else if (this.type == 4) { - return visitor.visit((Map) this.value); - } else if (this.type == 5) { - return visitor.visit((ConfiguredPropValueSql) this.value); - } else if (this.type == 6) { - return visitor.visit((String) this.value); - } else if (this.type == 7) { - return visitor.visit((List) this.value); - } - throw new IllegalStateException("Failed to visit value. This should never happen."); - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof ConfiguredPropValue && equalTo((ConfiguredPropValue) other); - } - - private boolean equalTo(ConfiguredPropValue other) { - return value.equals(other.value); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.value); - } - - @java.lang.Override - public String toString() { - return this.value.toString(); - } - - public static ConfiguredPropValue of(Object value) { - return new ConfiguredPropValue(value, 0); - } - - public static ConfiguredPropValue of(ConfiguredPropValueApp value) { - return new ConfiguredPropValue(value, 1); - } - - public static ConfiguredPropValue of(boolean value) { - return new ConfiguredPropValue(value, 2); - } - - public static ConfiguredPropValue of(double value) { - return new ConfiguredPropValue(value, 3); - } - - public static ConfiguredPropValue of(Map value) { - return new ConfiguredPropValue(value, 4); - } - - public static ConfiguredPropValue of(ConfiguredPropValueSql value) { - return new ConfiguredPropValue(value, 5); - } - - public static ConfiguredPropValue of(String value) { - return new ConfiguredPropValue(value, 6); - } - - public static ConfiguredPropValue of(List value) { - return new ConfiguredPropValue(value, 7); - } - - public interface Visitor { - T visit(Object value); - - T visit(ConfiguredPropValueApp value); - - T visit(boolean value); - - T visit(double value); - - T visit(Map value); - - T visit(ConfiguredPropValueSql value); - - T visit(String value); - - T visit(List value); - } - - static final class Deserializer extends StdDeserializer { - Deserializer() { - super(ConfiguredPropValue.class); - } - - @java.lang.Override - public ConfiguredPropValue deserialize(JsonParser p, DeserializationContext context) throws IOException { - Object value = p.readValueAs(Object.class); - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, Object.class)); - } catch (RuntimeException e) { - } - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, ConfiguredPropValueApp.class)); - } catch (RuntimeException e) { - } - if (value instanceof Boolean) { - return of((Boolean) value); - } - if (value instanceof Double) { - return of((Double) value); - } - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, new TypeReference>() {})); - } catch (RuntimeException e) { - } - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, ConfiguredPropValueSql.class)); - } catch (RuntimeException e) { - } - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (RuntimeException e) { - } - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, new TypeReference>() {})); - } catch (RuntimeException e) { - } - throw new JsonParseException(p, "Failed to deserialize"); - } - } -} diff --git a/src/main/java/com/pipedream/api/types/ConfiguredPropValueApp.java b/src/main/java/com/pipedream/api/types/ConfiguredPropValueApp.java deleted file mode 100644 index 1f16c97..0000000 --- a/src/main/java/com/pipedream/api/types/ConfiguredPropValueApp.java +++ /dev/null @@ -1,102 +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.databind.annotation.JsonDeserialize; -import com.pipedream.api.core.ObjectMappers; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import org.jetbrains.annotations.NotNull; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = ConfiguredPropValueApp.Builder.class) -public final class ConfiguredPropValueApp { - private final String authProvisionId; - - private final Map additionalProperties; - - private ConfiguredPropValueApp(String authProvisionId, Map additionalProperties) { - this.authProvisionId = authProvisionId; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("authProvisionId") - public String getAuthProvisionId() { - return authProvisionId; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof ConfiguredPropValueApp && equalTo((ConfiguredPropValueApp) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(ConfiguredPropValueApp other) { - return authProvisionId.equals(other.authProvisionId); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.authProvisionId); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static AuthProvisionIdStage builder() { - return new Builder(); - } - - public interface AuthProvisionIdStage { - _FinalStage authProvisionId(@NotNull String authProvisionId); - - Builder from(ConfiguredPropValueApp other); - } - - public interface _FinalStage { - ConfiguredPropValueApp build(); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements AuthProvisionIdStage, _FinalStage { - private String authProvisionId; - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - @java.lang.Override - public Builder from(ConfiguredPropValueApp other) { - authProvisionId(other.getAuthProvisionId()); - return this; - } - - @java.lang.Override - @JsonSetter("authProvisionId") - public _FinalStage authProvisionId(@NotNull String authProvisionId) { - this.authProvisionId = Objects.requireNonNull(authProvisionId, "authProvisionId must not be null"); - return this; - } - - @java.lang.Override - public ConfiguredPropValueApp build() { - return new ConfiguredPropValueApp(authProvisionId, additionalProperties); - } - } -} diff --git a/src/main/java/com/pipedream/api/types/ConfiguredPropValueSql.java b/src/main/java/com/pipedream/api/types/ConfiguredPropValueSql.java deleted file mode 100644 index 22ce442..0000000 --- a/src/main/java/com/pipedream/api/types/ConfiguredPropValueSql.java +++ /dev/null @@ -1,246 +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.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import org.jetbrains.annotations.NotNull; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = ConfiguredPropValueSql.Builder.class) -public final class ConfiguredPropValueSql { - private final String value; - - private final String query; - - private final List params; - - private final boolean usePreparedStatements; - - private final Map additionalProperties; - - private ConfiguredPropValueSql( - String value, - String query, - List params, - boolean usePreparedStatements, - Map additionalProperties) { - this.value = value; - this.query = query; - this.params = params; - this.usePreparedStatements = usePreparedStatements; - this.additionalProperties = additionalProperties; - } - - /** - * @return The raw SQL query, as provided by the user - */ - @JsonProperty("value") - public String getValue() { - return value; - } - - /** - * @return The SQL query to execute - */ - @JsonProperty("query") - public String getQuery() { - return query; - } - - /** - * @return The list of parameters for the prepared statement - */ - @JsonProperty("params") - public List getParams() { - return params; - } - - /** - * @return Whether to use prepared statements for the query or not - */ - @JsonProperty("usePreparedStatements") - public boolean getUsePreparedStatements() { - return usePreparedStatements; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof ConfiguredPropValueSql && equalTo((ConfiguredPropValueSql) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(ConfiguredPropValueSql other) { - return value.equals(other.value) - && query.equals(other.query) - && params.equals(other.params) - && usePreparedStatements == other.usePreparedStatements; - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.value, this.query, this.params, this.usePreparedStatements); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static ValueStage builder() { - return new Builder(); - } - - public interface ValueStage { - /** - *

The raw SQL query, as provided by the user

- */ - QueryStage value(@NotNull String value); - - Builder from(ConfiguredPropValueSql other); - } - - public interface QueryStage { - /** - *

The SQL query to execute

- */ - UsePreparedStatementsStage query(@NotNull String query); - } - - public interface UsePreparedStatementsStage { - /** - *

Whether to use prepared statements for the query or not

- */ - _FinalStage usePreparedStatements(boolean usePreparedStatements); - } - - public interface _FinalStage { - ConfiguredPropValueSql build(); - - /** - *

The list of parameters for the prepared statement

- */ - _FinalStage params(List params); - - _FinalStage addParams(String params); - - _FinalStage addAllParams(List params); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements ValueStage, QueryStage, UsePreparedStatementsStage, _FinalStage { - private String value; - - private String query; - - private boolean usePreparedStatements; - - private List params = new ArrayList<>(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - @java.lang.Override - public Builder from(ConfiguredPropValueSql other) { - value(other.getValue()); - query(other.getQuery()); - params(other.getParams()); - usePreparedStatements(other.getUsePreparedStatements()); - return this; - } - - /** - *

The raw SQL query, as provided by the user

- *

The raw SQL query, as provided by the user

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

The SQL query to execute

- *

The SQL query to execute

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

Whether to use prepared statements for the query or not

- *

Whether to use prepared statements for the query or not

- * @return Reference to {@code this} so that method calls can be chained together. - */ - @java.lang.Override - @JsonSetter("usePreparedStatements") - public _FinalStage usePreparedStatements(boolean usePreparedStatements) { - this.usePreparedStatements = usePreparedStatements; - return this; - } - - /** - *

The list of parameters for the prepared statement

- * @return Reference to {@code this} so that method calls can be chained together. - */ - @java.lang.Override - public _FinalStage addAllParams(List params) { - if (params != null) { - this.params.addAll(params); - } - return this; - } - - /** - *

The list of parameters for the prepared statement

- * @return Reference to {@code this} so that method calls can be chained together. - */ - @java.lang.Override - public _FinalStage addParams(String params) { - this.params.add(params); - return this; - } - - /** - *

The list of parameters for the prepared statement

- */ - @java.lang.Override - @JsonSetter(value = "params", nulls = Nulls.SKIP) - public _FinalStage params(List params) { - this.params.clear(); - this.params.addAll(params); - return this; - } - - @java.lang.Override - public ConfiguredPropValueSql build() { - return new ConfiguredPropValueSql(value, query, params, usePreparedStatements, additionalProperties); - } - } -} diff --git a/src/main/java/com/pipedream/api/types/DeployedComponent.java b/src/main/java/com/pipedream/api/types/DeployedComponent.java index d5d704f..4609792 100644 --- a/src/main/java/com/pipedream/api/types/DeployedComponent.java +++ b/src/main/java/com/pipedream/api/types/DeployedComponent.java @@ -32,7 +32,7 @@ public final class DeployedComponent { private final List configurableProps; - private final Map configuredProps; + private final Map configuredProps; private final boolean active; @@ -53,7 +53,7 @@ private DeployedComponent( String ownerId, String componentId, List configurableProps, - Map configuredProps, + Map configuredProps, boolean active, int createdAt, int updatedAt, @@ -107,8 +107,11 @@ public List getConfigurableProps() { return configurableProps; } + /** + * @return The configured properties of the component + */ @JsonProperty("configured_props") - public Map getConfiguredProps() { + public Map getConfiguredProps() { return configuredProps; } @@ -277,11 +280,14 @@ public interface _FinalStage { _FinalStage addAllConfigurableProps(List configurableProps); - _FinalStage configuredProps(Map configuredProps); + /** + *

The configured properties of the component

+ */ + _FinalStage configuredProps(Map configuredProps); - _FinalStage putAllConfiguredProps(Map configuredProps); + _FinalStage putAllConfiguredProps(Map configuredProps); - _FinalStage configuredProps(String key, ConfiguredPropValue value); + _FinalStage configuredProps(String key, Object value); _FinalStage callbackObservations(Optional callbackObservations); @@ -317,7 +323,7 @@ public static final class Builder private Optional callbackObservations = Optional.empty(); - private Map configuredProps = new LinkedHashMap<>(); + private Map configuredProps = new LinkedHashMap<>(); private List configurableProps = new ArrayList<>(); @@ -451,23 +457,34 @@ public _FinalStage callbackObservations(Optional callbackObservations) { return this; } + /** + *

The configured properties of the component

+ * @return Reference to {@code this} so that method calls can be chained together. + */ @java.lang.Override - public _FinalStage configuredProps(String key, ConfiguredPropValue value) { + public _FinalStage configuredProps(String key, Object value) { this.configuredProps.put(key, value); return this; } + /** + *

The configured properties of the component

+ * @return Reference to {@code this} so that method calls can be chained together. + */ @java.lang.Override - public _FinalStage putAllConfiguredProps(Map configuredProps) { + public _FinalStage putAllConfiguredProps(Map configuredProps) { if (configuredProps != null) { this.configuredProps.putAll(configuredProps); } return this; } + /** + *

The configured properties of the component

+ */ @java.lang.Override @JsonSetter(value = "configured_props", nulls = Nulls.SKIP) - public _FinalStage configuredProps(Map configuredProps) { + public _FinalStage configuredProps(Map configuredProps) { this.configuredProps.clear(); this.configuredProps.putAll(configuredProps); return this; diff --git a/src/main/java/com/pipedream/api/types/Observation.java b/src/main/java/com/pipedream/api/types/Observation.java deleted file mode 100644 index 528ee85..0000000 --- a/src/main/java/com/pipedream/api/types/Observation.java +++ /dev/null @@ -1,222 +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; -import org.jetbrains.annotations.NotNull; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = Observation.Builder.class) -public final class Observation { - private final Optional err; - - private final String k; - - private final Optional msg; - - private final double ts; - - private final Map additionalProperties; - - private Observation( - Optional err, - String k, - Optional msg, - double ts, - Map additionalProperties) { - this.err = err; - this.k = k; - this.msg = msg; - this.ts = ts; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("err") - public Optional getErr() { - return err; - } - - /** - * @return The source of the log (e.g. console.log) - */ - @JsonProperty("k") - public String getK() { - return k; - } - - /** - * @return The log message - */ - @JsonProperty("msg") - public Optional getMsg() { - return msg; - } - - /** - * @return The time at which the log was produced, as milliseconds since the epoch - */ - @JsonProperty("ts") - public double getTs() { - return ts; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof Observation && equalTo((Observation) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(Observation other) { - return err.equals(other.err) && k.equals(other.k) && msg.equals(other.msg) && ts == other.ts; - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.err, this.k, this.msg, this.ts); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static KStage builder() { - return new Builder(); - } - - public interface KStage { - /** - *

The source of the log (e.g. console.log)

- */ - TsStage k(@NotNull String k); - - Builder from(Observation other); - } - - public interface TsStage { - /** - *

The time at which the log was produced, as milliseconds since the epoch

- */ - _FinalStage ts(double ts); - } - - public interface _FinalStage { - Observation build(); - - _FinalStage err(Optional err); - - _FinalStage err(ObservationError err); - - /** - *

The log message

- */ - _FinalStage msg(Optional msg); - - _FinalStage msg(String msg); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements KStage, TsStage, _FinalStage { - private String k; - - private double ts; - - private Optional msg = Optional.empty(); - - private Optional err = Optional.empty(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - @java.lang.Override - public Builder from(Observation other) { - err(other.getErr()); - k(other.getK()); - msg(other.getMsg()); - ts(other.getTs()); - return this; - } - - /** - *

The source of the log (e.g. console.log)

- *

The source of the log (e.g. console.log)

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

The time at which the log was produced, as milliseconds since the epoch

- *

The time at which the log was produced, as milliseconds since the epoch

- * @return Reference to {@code this} so that method calls can be chained together. - */ - @java.lang.Override - @JsonSetter("ts") - public _FinalStage ts(double ts) { - this.ts = ts; - return this; - } - - /** - *

The log message

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

The log message

- */ - @java.lang.Override - @JsonSetter(value = "msg", nulls = Nulls.SKIP) - public _FinalStage msg(Optional msg) { - this.msg = msg; - return this; - } - - @java.lang.Override - public _FinalStage err(ObservationError err) { - this.err = Optional.ofNullable(err); - return this; - } - - @java.lang.Override - @JsonSetter(value = "err", nulls = Nulls.SKIP) - public _FinalStage err(Optional err) { - this.err = err; - return this; - } - - @java.lang.Override - public Observation build() { - return new Observation(err, k, msg, ts, additionalProperties); - } - } -} diff --git a/src/main/java/com/pipedream/api/types/ObservationError.java b/src/main/java/com/pipedream/api/types/ObservationError.java deleted file mode 100644 index 3993a6b..0000000 --- a/src/main/java/com/pipedream/api/types/ObservationError.java +++ /dev/null @@ -1,161 +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 = ObservationError.Builder.class) -public final class ObservationError { - private final Optional name; - - private final Optional message; - - private final Optional stack; - - private final Map additionalProperties; - - private ObservationError( - Optional name, - Optional message, - Optional stack, - Map additionalProperties) { - this.name = name; - this.message = message; - this.stack = stack; - this.additionalProperties = additionalProperties; - } - - /** - * @return The name of the error/exception - */ - @JsonProperty("name") - public Optional getName() { - return name; - } - - /** - * @return The error message - */ - @JsonProperty("message") - public Optional getMessage() { - return message; - } - - /** - * @return The stack trace of the error - */ - @JsonProperty("stack") - public Optional getStack() { - return stack; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof ObservationError && equalTo((ObservationError) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(ObservationError other) { - return name.equals(other.name) && message.equals(other.message) && stack.equals(other.stack); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.name, this.message, this.stack); - } - - @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 name = Optional.empty(); - - private Optional message = Optional.empty(); - - private Optional stack = Optional.empty(); - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - public Builder from(ObservationError other) { - name(other.getName()); - message(other.getMessage()); - stack(other.getStack()); - return this; - } - - /** - *

The name of the error/exception

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

The error message

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

The stack trace of the error

- */ - @JsonSetter(value = "stack", nulls = Nulls.SKIP) - public Builder stack(Optional stack) { - this.stack = stack; - return this; - } - - public Builder stack(String stack) { - this.stack = Optional.ofNullable(stack); - return this; - } - - public ObservationError build() { - return new ObservationError(name, message, stack, additionalProperties); - } - } -} diff --git a/src/main/java/com/pipedream/api/types/PropOption.java b/src/main/java/com/pipedream/api/types/PropOption.java index 29d341b..f3fd389 100644 --- a/src/main/java/com/pipedream/api/types/PropOption.java +++ b/src/main/java/com/pipedream/api/types/PropOption.java @@ -9,13 +9,11 @@ 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; import org.jetbrains.annotations.NotNull; @JsonInclude(JsonInclude.Include.NON_ABSENT) @@ -23,11 +21,11 @@ public final class PropOption { private final String label; - private final Optional value; + private final Object value; private final Map additionalProperties; - private PropOption(String label, Optional value, Map additionalProperties) { + private PropOption(String label, Object value, Map additionalProperties) { this.label = label; this.value = value; this.additionalProperties = additionalProperties; @@ -42,7 +40,7 @@ public String getLabel() { } @JsonProperty("value") - public Optional getValue() { + public Object getValue() { return value; } @@ -79,24 +77,24 @@ public interface LabelStage { /** *

The human-readable label for the option

*/ - _FinalStage label(@NotNull String label); + ValueStage label(@NotNull String label); Builder from(PropOption other); } + public interface ValueStage { + _FinalStage value(Object value); + } + public interface _FinalStage { PropOption build(); - - _FinalStage value(Optional value); - - _FinalStage value(PropOptionValue value); } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements LabelStage, _FinalStage { + public static final class Builder implements LabelStage, ValueStage, _FinalStage { private String label; - private Optional value = Optional.empty(); + private Object value; @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -117,20 +115,14 @@ public Builder from(PropOption other) { */ @java.lang.Override @JsonSetter("label") - public _FinalStage label(@NotNull String label) { + public ValueStage label(@NotNull String label) { this.label = Objects.requireNonNull(label, "label must not be null"); return this; } @java.lang.Override - public _FinalStage value(PropOptionValue value) { - this.value = Optional.ofNullable(value); - return this; - } - - @java.lang.Override - @JsonSetter(value = "value", nulls = Nulls.SKIP) - public _FinalStage value(Optional value) { + @JsonSetter("value") + public _FinalStage value(Object value) { this.value = value; return this; } diff --git a/src/main/java/com/pipedream/api/types/PropOptionNested.java b/src/main/java/com/pipedream/api/types/PropOptionNested.java deleted file mode 100644 index 6224151..0000000 --- a/src/main/java/com/pipedream/api/types/PropOptionNested.java +++ /dev/null @@ -1,102 +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.databind.annotation.JsonDeserialize; -import com.pipedream.api.core.ObjectMappers; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import org.jetbrains.annotations.NotNull; - -@JsonInclude(JsonInclude.Include.NON_ABSENT) -@JsonDeserialize(builder = PropOptionNested.Builder.class) -public final class PropOptionNested { - private final PropOption lv; - - private final Map additionalProperties; - - private PropOptionNested(PropOption lv, Map additionalProperties) { - this.lv = lv; - this.additionalProperties = additionalProperties; - } - - @JsonProperty("__lv") - public PropOption getLv() { - return lv; - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof PropOptionNested && equalTo((PropOptionNested) other); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - private boolean equalTo(PropOptionNested other) { - return lv.equals(other.lv); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.lv); - } - - @java.lang.Override - public String toString() { - return ObjectMappers.stringify(this); - } - - public static LvStage builder() { - return new Builder(); - } - - public interface LvStage { - _FinalStage lv(@NotNull PropOption lv); - - Builder from(PropOptionNested other); - } - - public interface _FinalStage { - PropOptionNested build(); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements LvStage, _FinalStage { - private PropOption lv; - - @JsonAnySetter - private Map additionalProperties = new HashMap<>(); - - private Builder() {} - - @java.lang.Override - public Builder from(PropOptionNested other) { - lv(other.getLv()); - return this; - } - - @java.lang.Override - @JsonSetter("__lv") - public _FinalStage lv(@NotNull PropOption lv) { - this.lv = Objects.requireNonNull(lv, "lv must not be null"); - return this; - } - - @java.lang.Override - public PropOptionNested build() { - return new PropOptionNested(lv, additionalProperties); - } - } -} diff --git a/src/main/java/com/pipedream/api/types/PropOptionValue.java b/src/main/java/com/pipedream/api/types/PropOptionValue.java deleted file mode 100644 index 4ccaf0b..0000000 --- a/src/main/java/com/pipedream/api/types/PropOptionValue.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * This file was auto-generated by Fern from our API Definition. - */ -package com.pipedream.api.types; - -import com.fasterxml.jackson.annotation.JsonValue; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import com.pipedream.api.core.ObjectMappers; -import java.io.IOException; -import java.util.Objects; - -@JsonDeserialize(using = PropOptionValue.Deserializer.class) -public final class PropOptionValue { - private final Object value; - - private final int type; - - private PropOptionValue(Object value, int type) { - this.value = value; - this.type = type; - } - - @JsonValue - public Object get() { - return this.value; - } - - @SuppressWarnings("unchecked") - public T visit(Visitor visitor) { - if (this.type == 0) { - return visitor.visit((String) this.value); - } else if (this.type == 1) { - return visitor.visit((int) this.value); - } else if (this.type == 2) { - return visitor.visit((boolean) this.value); - } - throw new IllegalStateException("Failed to visit value. This should never happen."); - } - - @java.lang.Override - public boolean equals(Object other) { - if (this == other) return true; - return other instanceof PropOptionValue && equalTo((PropOptionValue) other); - } - - private boolean equalTo(PropOptionValue other) { - return value.equals(other.value); - } - - @java.lang.Override - public int hashCode() { - return Objects.hash(this.value); - } - - @java.lang.Override - public String toString() { - return this.value.toString(); - } - - public static PropOptionValue of(String value) { - return new PropOptionValue(value, 0); - } - - public static PropOptionValue of(int value) { - return new PropOptionValue(value, 1); - } - - public static PropOptionValue of(boolean value) { - return new PropOptionValue(value, 2); - } - - public interface Visitor { - T visit(String value); - - T visit(int value); - - T visit(boolean value); - } - - static final class Deserializer extends StdDeserializer { - Deserializer() { - super(PropOptionValue.class); - } - - @java.lang.Override - public PropOptionValue deserialize(JsonParser p, DeserializationContext context) throws IOException { - Object value = p.readValueAs(Object.class); - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class)); - } catch (RuntimeException e) { - } - if (value instanceof Integer) { - return of((Integer) value); - } - if (value instanceof Boolean) { - return of((Boolean) value); - } - throw new JsonParseException(p, "Failed to deserialize"); - } - } -} diff --git a/src/main/java/com/pipedream/api/types/ReloadPropsOpts.java b/src/main/java/com/pipedream/api/types/ReloadPropsOpts.java index 4af3415..2b06ac8 100644 --- a/src/main/java/com/pipedream/api/types/ReloadPropsOpts.java +++ b/src/main/java/com/pipedream/api/types/ReloadPropsOpts.java @@ -27,7 +27,7 @@ public final class ReloadPropsOpts { private final Optional blocking; - private final Optional> configuredProps; + private final Optional> configuredProps; private final Optional dynamicPropsId; @@ -37,7 +37,7 @@ private ReloadPropsOpts( String id, String externalUserId, Optional blocking, - Optional> configuredProps, + Optional> configuredProps, Optional dynamicPropsId, Map additionalProperties) { this.id = id; @@ -72,8 +72,11 @@ public Optional getBlocking() { return blocking; } + /** + * @return The configured properties for the component + */ @JsonProperty("configured_props") - public Optional> getConfiguredProps() { + public Optional> getConfiguredProps() { return configuredProps; } @@ -144,9 +147,12 @@ public interface _FinalStage { _FinalStage blocking(Boolean blocking); - _FinalStage configuredProps(Optional> configuredProps); + /** + *

The configured properties for the component

+ */ + _FinalStage configuredProps(Optional> configuredProps); - _FinalStage configuredProps(Map configuredProps); + _FinalStage configuredProps(Map configuredProps); /** *

The ID for dynamic props

@@ -164,7 +170,7 @@ public static final class Builder implements IdStage, ExternalUserIdStage, _Fina private Optional dynamicPropsId = Optional.empty(); - private Optional> configuredProps = Optional.empty(); + private Optional> configuredProps = Optional.empty(); private Optional blocking = Optional.empty(); @@ -227,15 +233,22 @@ public _FinalStage dynamicPropsId(Optional dynamicPropsId) { return this; } + /** + *

The configured properties for the component

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

The configured properties for the component

+ */ @java.lang.Override @JsonSetter(value = "configured_props", nulls = Nulls.SKIP) - public _FinalStage configuredProps(Optional> configuredProps) { + public _FinalStage configuredProps(Optional> configuredProps) { this.configuredProps = configuredProps; return this; } diff --git a/src/main/java/com/pipedream/api/types/ReloadPropsResponse.java b/src/main/java/com/pipedream/api/types/ReloadPropsResponse.java index 4fe9986..ad3e825 100644 --- a/src/main/java/com/pipedream/api/types/ReloadPropsResponse.java +++ b/src/main/java/com/pipedream/api/types/ReloadPropsResponse.java @@ -21,7 +21,7 @@ @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonDeserialize(builder = ReloadPropsResponse.Builder.class) public final class ReloadPropsResponse { - private final Optional> observations; + private final Optional> observations; private final Optional> errors; @@ -30,7 +30,7 @@ public final class ReloadPropsResponse { private final Map additionalProperties; private ReloadPropsResponse( - Optional> observations, + Optional> observations, Optional> errors, Optional dynamicProps, Map additionalProperties) { @@ -40,8 +40,11 @@ private ReloadPropsResponse( this.additionalProperties = additionalProperties; } + /** + * @return Any logs produced during the configuration of the prop + */ @JsonProperty("observations") - public Optional> getObservations() { + public Optional> getObservations() { return observations; } @@ -91,7 +94,7 @@ public static Builder builder() { @JsonIgnoreProperties(ignoreUnknown = true) public static final class Builder { - private Optional> observations = Optional.empty(); + private Optional> observations = Optional.empty(); private Optional> errors = Optional.empty(); @@ -109,13 +112,16 @@ public Builder from(ReloadPropsResponse other) { return this; } + /** + *

Any logs produced during the configuration of the prop

+ */ @JsonSetter(value = "observations", nulls = Nulls.SKIP) - public Builder observations(Optional> observations) { + public Builder observations(Optional> observations) { this.observations = observations; return this; } - public Builder observations(List observations) { + public Builder observations(Map observations) { this.observations = Optional.ofNullable(observations); return this; }