Skip to content

Commit a6f5ae3

Browse files
fern-api[bot]fern-api[bot]
authored
Revisit types (#43)
* Remove `x-async-handle` logic * Unnest payload entries for action runs, and prop config/reload * Unnest query params for Connect token validation * Add missing configurable prop types and fields --------- Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
1 parent 3dbddb8 commit a6f5ae3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+8502
-1273
lines changed

‎src/main/java/com/pipedream/api/resources/actions/ActionsClient.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import com.pipedream.api.core.ClientOptions;
77
import com.pipedream.api.core.RequestOptions;
88
import com.pipedream.api.core.pagination.SyncPagingIterable;
9-
import com.pipedream.api.resources.actions.requests.ActionsConfigurePropRequest;
109
import com.pipedream.api.resources.actions.requests.ActionsListRequest;
11-
import com.pipedream.api.resources.actions.requests.ActionsReloadPropsRequest;
1210
import com.pipedream.api.resources.actions.requests.RunActionOpts;
1311
import com.pipedream.api.types.Component;
12+
import com.pipedream.api.types.ConfigurePropOpts;
1413
import com.pipedream.api.types.ConfigurePropResponse;
14+
import com.pipedream.api.types.ReloadPropsOpts;
1515
import com.pipedream.api.types.ReloadPropsResponse;
1616
import com.pipedream.api.types.RunActionResponse;
1717

@@ -52,19 +52,19 @@ public Component retrieve(String componentId, RequestOptions requestOptions) {
5252
return this.rawClient.retrieve(componentId, requestOptions).body();
5353
}
5454

55-
public ConfigurePropResponse configureProp(ActionsConfigurePropRequest request) {
55+
public ConfigurePropResponse configureProp(ConfigurePropOpts request) {
5656
return this.rawClient.configureProp(request).body();
5757
}
5858

59-
public ConfigurePropResponse configureProp(ActionsConfigurePropRequest request, RequestOptions requestOptions) {
59+
public ConfigurePropResponse configureProp(ConfigurePropOpts request, RequestOptions requestOptions) {
6060
return this.rawClient.configureProp(request, requestOptions).body();
6161
}
6262

63-
public ReloadPropsResponse reloadProps(ActionsReloadPropsRequest request) {
63+
public ReloadPropsResponse reloadProps(ReloadPropsOpts request) {
6464
return this.rawClient.reloadProps(request).body();
6565
}
6666

67-
public ReloadPropsResponse reloadProps(ActionsReloadPropsRequest request, RequestOptions requestOptions) {
67+
public ReloadPropsResponse reloadProps(ReloadPropsOpts request, RequestOptions requestOptions) {
6868
return this.rawClient.reloadProps(request, requestOptions).body();
6969
}
7070

‎src/main/java/com/pipedream/api/resources/actions/AsyncActionsClient.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import com.pipedream.api.core.ClientOptions;
77
import com.pipedream.api.core.RequestOptions;
88
import com.pipedream.api.core.pagination.SyncPagingIterable;
9-
import com.pipedream.api.resources.actions.requests.ActionsConfigurePropRequest;
109
import com.pipedream.api.resources.actions.requests.ActionsListRequest;
11-
import com.pipedream.api.resources.actions.requests.ActionsReloadPropsRequest;
1210
import com.pipedream.api.resources.actions.requests.RunActionOpts;
1311
import com.pipedream.api.types.Component;
12+
import com.pipedream.api.types.ConfigurePropOpts;
1413
import com.pipedream.api.types.ConfigurePropResponse;
14+
import com.pipedream.api.types.ReloadPropsOpts;
1515
import com.pipedream.api.types.ReloadPropsResponse;
1616
import com.pipedream.api.types.RunActionResponse;
1717
import java.util.concurrent.CompletableFuture;
@@ -54,21 +54,20 @@ public CompletableFuture<Component> retrieve(String componentId, RequestOptions
5454
return this.rawClient.retrieve(componentId, requestOptions).thenApply(response -> response.body());
5555
}
5656

57-
public CompletableFuture<ConfigurePropResponse> configureProp(ActionsConfigurePropRequest request) {
57+
public CompletableFuture<ConfigurePropResponse> configureProp(ConfigurePropOpts request) {
5858
return this.rawClient.configureProp(request).thenApply(response -> response.body());
5959
}
6060

6161
public CompletableFuture<ConfigurePropResponse> configureProp(
62-
ActionsConfigurePropRequest request, RequestOptions requestOptions) {
62+
ConfigurePropOpts request, RequestOptions requestOptions) {
6363
return this.rawClient.configureProp(request, requestOptions).thenApply(response -> response.body());
6464
}
6565

66-
public CompletableFuture<ReloadPropsResponse> reloadProps(ActionsReloadPropsRequest request) {
66+
public CompletableFuture<ReloadPropsResponse> reloadProps(ReloadPropsOpts request) {
6767
return this.rawClient.reloadProps(request).thenApply(response -> response.body());
6868
}
6969

70-
public CompletableFuture<ReloadPropsResponse> reloadProps(
71-
ActionsReloadPropsRequest request, RequestOptions requestOptions) {
70+
public CompletableFuture<ReloadPropsResponse> reloadProps(ReloadPropsOpts request, RequestOptions requestOptions) {
7271
return this.rawClient.reloadProps(request, requestOptions).thenApply(response -> response.body());
7372
}
7473

‎src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java‎

Lines changed: 25 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package com.pipedream.api.resources.actions;
55

6+
import com.fasterxml.jackson.core.JsonProcessingException;
67
import com.pipedream.api.core.BaseClientApiException;
78
import com.pipedream.api.core.BaseClientException;
89
import com.pipedream.api.core.BaseClientHttpResponse;
@@ -12,20 +13,18 @@
1213
import com.pipedream.api.core.QueryStringMapper;
1314
import com.pipedream.api.core.RequestOptions;
1415
import com.pipedream.api.core.pagination.SyncPagingIterable;
15-
import com.pipedream.api.resources.actions.requests.ActionsConfigurePropRequest;
1616
import com.pipedream.api.resources.actions.requests.ActionsListRequest;
17-
import com.pipedream.api.resources.actions.requests.ActionsReloadPropsRequest;
1817
import com.pipedream.api.resources.actions.requests.RunActionOpts;
1918
import com.pipedream.api.types.Component;
19+
import com.pipedream.api.types.ConfigurePropOpts;
2020
import com.pipedream.api.types.ConfigurePropResponse;
2121
import com.pipedream.api.types.GetComponentResponse;
2222
import com.pipedream.api.types.GetComponentsResponse;
23+
import com.pipedream.api.types.ReloadPropsOpts;
2324
import com.pipedream.api.types.ReloadPropsResponse;
2425
import com.pipedream.api.types.RunActionResponse;
2526
import java.io.IOException;
26-
import java.util.HashMap;
2727
import java.util.List;
28-
import java.util.Map;
2928
import java.util.Optional;
3029
import java.util.concurrent.CompletableFuture;
3130
import java.util.concurrent.ExecutionException;
@@ -192,13 +191,12 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
192191
return future;
193192
}
194193

195-
public CompletableFuture<BaseClientHttpResponse<ConfigurePropResponse>> configureProp(
196-
ActionsConfigurePropRequest request) {
194+
public CompletableFuture<BaseClientHttpResponse<ConfigurePropResponse>> configureProp(ConfigurePropOpts request) {
197195
return configureProp(request, null);
198196
}
199197

200198
public CompletableFuture<BaseClientHttpResponse<ConfigurePropResponse>> configureProp(
201-
ActionsConfigurePropRequest request, RequestOptions requestOptions) {
199+
ConfigurePropOpts request, RequestOptions requestOptions) {
202200
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
203201
.newBuilder()
204202
.addPathSegments("v1/connect")
@@ -208,20 +206,17 @@ public CompletableFuture<BaseClientHttpResponse<ConfigurePropResponse>> configur
208206
RequestBody body;
209207
try {
210208
body = RequestBody.create(
211-
ObjectMappers.JSON_MAPPER.writeValueAsBytes(request.getBody()), MediaTypes.APPLICATION_JSON);
212-
} catch (Exception e) {
213-
throw new RuntimeException(e);
209+
ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON);
210+
} catch (JsonProcessingException e) {
211+
throw new BaseClientException("Failed to serialize request", e);
214212
}
215-
Request.Builder _requestBuilder = new Request.Builder()
213+
Request okhttpRequest = new Request.Builder()
216214
.url(httpUrl)
217215
.method("POST", body)
218216
.headers(Headers.of(clientOptions.headers(requestOptions)))
219217
.addHeader("Content-Type", "application/json")
220-
.addHeader("Accept", "application/json");
221-
if (request.getAsyncHandle().isPresent()) {
222-
_requestBuilder.addHeader("x-async-handle", request.getAsyncHandle().get());
223-
}
224-
Request okhttpRequest = _requestBuilder.build();
218+
.addHeader("Accept", "application/json")
219+
.build();
225220
OkHttpClient client = clientOptions.httpClient();
226221
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
227222
client = clientOptions.httpClientWithTimeout(requestOptions);
@@ -257,13 +252,12 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
257252
return future;
258253
}
259254

260-
public CompletableFuture<BaseClientHttpResponse<ReloadPropsResponse>> reloadProps(
261-
ActionsReloadPropsRequest request) {
255+
public CompletableFuture<BaseClientHttpResponse<ReloadPropsResponse>> reloadProps(ReloadPropsOpts request) {
262256
return reloadProps(request, null);
263257
}
264258

265259
public CompletableFuture<BaseClientHttpResponse<ReloadPropsResponse>> reloadProps(
266-
ActionsReloadPropsRequest request, RequestOptions requestOptions) {
260+
ReloadPropsOpts request, RequestOptions requestOptions) {
267261
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
268262
.newBuilder()
269263
.addPathSegments("v1/connect")
@@ -273,20 +267,17 @@ public CompletableFuture<BaseClientHttpResponse<ReloadPropsResponse>> reloadProp
273267
RequestBody body;
274268
try {
275269
body = RequestBody.create(
276-
ObjectMappers.JSON_MAPPER.writeValueAsBytes(request.getBody()), MediaTypes.APPLICATION_JSON);
277-
} catch (Exception e) {
278-
throw new RuntimeException(e);
270+
ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON);
271+
} catch (JsonProcessingException e) {
272+
throw new BaseClientException("Failed to serialize request", e);
279273
}
280-
Request.Builder _requestBuilder = new Request.Builder()
274+
Request okhttpRequest = new Request.Builder()
281275
.url(httpUrl)
282276
.method("POST", body)
283277
.headers(Headers.of(clientOptions.headers(requestOptions)))
284278
.addHeader("Content-Type", "application/json")
285-
.addHeader("Accept", "application/json");
286-
if (request.getAsyncHandle().isPresent()) {
287-
_requestBuilder.addHeader("x-async-handle", request.getAsyncHandle().get());
288-
}
289-
Request okhttpRequest = _requestBuilder.build();
279+
.addHeader("Accept", "application/json")
280+
.build();
290281
OkHttpClient client = clientOptions.httpClient();
291282
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
292283
client = clientOptions.httpClientWithTimeout(requestOptions);
@@ -334,35 +325,20 @@ public CompletableFuture<BaseClientHttpResponse<RunActionResponse>> run(
334325
.addPathSegment(clientOptions.projectId())
335326
.addPathSegments("actions/run")
336327
.build();
337-
Map<String, Object> properties = new HashMap<>();
338-
properties.put("id", request.getId());
339-
properties.put("external_user_id", request.getExternalUserId());
340-
if (request.getConfiguredProps().isPresent()) {
341-
properties.put("configured_props", request.getConfiguredProps());
342-
}
343-
if (request.getDynamicPropsId().isPresent()) {
344-
properties.put("dynamic_props_id", request.getDynamicPropsId());
345-
}
346-
if (request.getStashId().isPresent()) {
347-
properties.put("stash_id", request.getStashId());
348-
}
349328
RequestBody body;
350329
try {
351330
body = RequestBody.create(
352-
ObjectMappers.JSON_MAPPER.writeValueAsBytes(properties), MediaTypes.APPLICATION_JSON);
353-
} catch (Exception e) {
354-
throw new RuntimeException(e);
331+
ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON);
332+
} catch (JsonProcessingException e) {
333+
throw new BaseClientException("Failed to serialize request", e);
355334
}
356-
Request.Builder _requestBuilder = new Request.Builder()
335+
Request okhttpRequest = new Request.Builder()
357336
.url(httpUrl)
358337
.method("POST", body)
359338
.headers(Headers.of(clientOptions.headers(requestOptions)))
360339
.addHeader("Content-Type", "application/json")
361-
.addHeader("Accept", "application/json");
362-
if (request.getAsyncHandle().isPresent()) {
363-
_requestBuilder.addHeader("x-async-handle", request.getAsyncHandle().get());
364-
}
365-
Request okhttpRequest = _requestBuilder.build();
340+
.addHeader("Accept", "application/json")
341+
.build();
366342
OkHttpClient client = clientOptions.httpClient();
367343
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
368344
client = clientOptions.httpClientWithTimeout(requestOptions);

0 commit comments

Comments
 (0)