Skip to content

Commit 8099c0e

Browse files
jvercejverce
committed
Undo irrelevant changes
1 parent 4982e99 commit 8099c0e

File tree

129 files changed

+1813
-11785
lines changed

Some content is hidden

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

129 files changed

+1813
-11785
lines changed

‎src/main/java/com/pipedream/api/resources/accounts/AccountsClient.java‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
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.accounts.requests.AccountsListRequest;
10+
import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest;
911
import com.pipedream.api.resources.accounts.requests.CreateAccountOpts;
10-
import com.pipedream.api.resources.accounts.requests.DeleteAccountsRequest;
11-
import com.pipedream.api.resources.accounts.requests.DeleteByAppAccountsRequest;
12-
import com.pipedream.api.resources.accounts.requests.ListAccountsRequest;
13-
import com.pipedream.api.resources.accounts.requests.RetrieveAccountsRequest;
1412
import com.pipedream.api.types.Account;
1513

1614
public class AccountsClient {
@@ -40,14 +38,14 @@ public SyncPagingIterable<Account> list() {
4038
/**
4139
* Retrieve all connected accounts for the project with optional filtering
4240
*/
43-
public SyncPagingIterable<Account> list(ListAccountsRequest request) {
41+
public SyncPagingIterable<Account> list(AccountsListRequest request) {
4442
return this.rawClient.list(request).body();
4543
}
4644

4745
/**
4846
* Retrieve all connected accounts for the project with optional filtering
4947
*/
50-
public SyncPagingIterable<Account> list(ListAccountsRequest request, RequestOptions requestOptions) {
48+
public SyncPagingIterable<Account> list(AccountsListRequest request, RequestOptions requestOptions) {
5149
return this.rawClient.list(request, requestOptions).body();
5250
}
5351

@@ -75,14 +73,14 @@ public Account retrieve(String accountId) {
7573
/**
7674
* Get the details for a specific connected account
7775
*/
78-
public Account retrieve(String accountId, RetrieveAccountsRequest request) {
76+
public Account retrieve(String accountId, AccountsRetrieveRequest request) {
7977
return this.rawClient.retrieve(accountId, request).body();
8078
}
8179

8280
/**
8381
* Get the details for a specific connected account
8482
*/
85-
public Account retrieve(String accountId, RetrieveAccountsRequest request, RequestOptions requestOptions) {
83+
public Account retrieve(String accountId, AccountsRetrieveRequest request, RequestOptions requestOptions) {
8684
return this.rawClient.retrieve(accountId, request, requestOptions).body();
8785
}
8886

@@ -96,15 +94,8 @@ public void delete(String accountId) {
9694
/**
9795
* Remove a connected account and its associated credentials
9896
*/
99-
public void delete(String accountId, DeleteAccountsRequest request) {
100-
this.rawClient.delete(accountId, request).body();
101-
}
102-
103-
/**
104-
* Remove a connected account and its associated credentials
105-
*/
106-
public void delete(String accountId, DeleteAccountsRequest request, RequestOptions requestOptions) {
107-
this.rawClient.delete(accountId, request, requestOptions).body();
97+
public void delete(String accountId, RequestOptions requestOptions) {
98+
this.rawClient.delete(accountId, requestOptions).body();
10899
}
109100

110101
/**
@@ -117,14 +108,7 @@ public void deleteByApp(String appId) {
117108
/**
118109
* Remove all connected accounts for a specific app
119110
*/
120-
public void deleteByApp(String appId, DeleteByAppAccountsRequest request) {
121-
this.rawClient.deleteByApp(appId, request).body();
122-
}
123-
124-
/**
125-
* Remove all connected accounts for a specific app
126-
*/
127-
public void deleteByApp(String appId, DeleteByAppAccountsRequest request, RequestOptions requestOptions) {
128-
this.rawClient.deleteByApp(appId, request, requestOptions).body();
111+
public void deleteByApp(String appId, RequestOptions requestOptions) {
112+
this.rawClient.deleteByApp(appId, requestOptions).body();
129113
}
130114
}

‎src/main/java/com/pipedream/api/resources/accounts/AsyncAccountsClient.java‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
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.accounts.requests.AccountsListRequest;
10+
import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest;
911
import com.pipedream.api.resources.accounts.requests.CreateAccountOpts;
10-
import com.pipedream.api.resources.accounts.requests.DeleteAccountsRequest;
11-
import com.pipedream.api.resources.accounts.requests.DeleteByAppAccountsRequest;
12-
import com.pipedream.api.resources.accounts.requests.ListAccountsRequest;
13-
import com.pipedream.api.resources.accounts.requests.RetrieveAccountsRequest;
1412
import com.pipedream.api.types.Account;
1513
import java.util.concurrent.CompletableFuture;
1614

@@ -41,15 +39,15 @@ public CompletableFuture<SyncPagingIterable<Account>> list() {
4139
/**
4240
* Retrieve all connected accounts for the project with optional filtering
4341
*/
44-
public CompletableFuture<SyncPagingIterable<Account>> list(ListAccountsRequest request) {
42+
public CompletableFuture<SyncPagingIterable<Account>> list(AccountsListRequest request) {
4543
return this.rawClient.list(request).thenApply(response -> response.body());
4644
}
4745

4846
/**
4947
* Retrieve all connected accounts for the project with optional filtering
5048
*/
5149
public CompletableFuture<SyncPagingIterable<Account>> list(
52-
ListAccountsRequest request, RequestOptions requestOptions) {
50+
AccountsListRequest request, RequestOptions requestOptions) {
5351
return this.rawClient.list(request, requestOptions).thenApply(response -> response.body());
5452
}
5553

@@ -77,15 +75,15 @@ public CompletableFuture<Account> retrieve(String accountId) {
7775
/**
7876
* Get the details for a specific connected account
7977
*/
80-
public CompletableFuture<Account> retrieve(String accountId, RetrieveAccountsRequest request) {
78+
public CompletableFuture<Account> retrieve(String accountId, AccountsRetrieveRequest request) {
8179
return this.rawClient.retrieve(accountId, request).thenApply(response -> response.body());
8280
}
8381

8482
/**
8583
* Get the details for a specific connected account
8684
*/
8785
public CompletableFuture<Account> retrieve(
88-
String accountId, RetrieveAccountsRequest request, RequestOptions requestOptions) {
86+
String accountId, AccountsRetrieveRequest request, RequestOptions requestOptions) {
8987
return this.rawClient.retrieve(accountId, request, requestOptions).thenApply(response -> response.body());
9088
}
9189

@@ -99,16 +97,8 @@ public CompletableFuture<Void> delete(String accountId) {
9997
/**
10098
* Remove a connected account and its associated credentials
10199
*/
102-
public CompletableFuture<Void> delete(String accountId, DeleteAccountsRequest request) {
103-
return this.rawClient.delete(accountId, request).thenApply(response -> response.body());
104-
}
105-
106-
/**
107-
* Remove a connected account and its associated credentials
108-
*/
109-
public CompletableFuture<Void> delete(
110-
String accountId, DeleteAccountsRequest request, RequestOptions requestOptions) {
111-
return this.rawClient.delete(accountId, request, requestOptions).thenApply(response -> response.body());
100+
public CompletableFuture<Void> delete(String accountId, RequestOptions requestOptions) {
101+
return this.rawClient.delete(accountId, requestOptions).thenApply(response -> response.body());
112102
}
113103

114104
/**
@@ -121,15 +111,7 @@ public CompletableFuture<Void> deleteByApp(String appId) {
121111
/**
122112
* Remove all connected accounts for a specific app
123113
*/
124-
public CompletableFuture<Void> deleteByApp(String appId, DeleteByAppAccountsRequest request) {
125-
return this.rawClient.deleteByApp(appId, request).thenApply(response -> response.body());
126-
}
127-
128-
/**
129-
* Remove all connected accounts for a specific app
130-
*/
131-
public CompletableFuture<Void> deleteByApp(
132-
String appId, DeleteByAppAccountsRequest request, RequestOptions requestOptions) {
133-
return this.rawClient.deleteByApp(appId, request, requestOptions).thenApply(response -> response.body());
114+
public CompletableFuture<Void> deleteByApp(String appId, RequestOptions requestOptions) {
115+
return this.rawClient.deleteByApp(appId, requestOptions).thenApply(response -> response.body());
134116
}
135117
}

‎src/main/java/com/pipedream/api/resources/accounts/AsyncRawAccountsClient.java‎

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414
import com.pipedream.api.core.RequestOptions;
1515
import com.pipedream.api.core.pagination.SyncPagingIterable;
1616
import com.pipedream.api.errors.TooManyRequestsError;
17+
import com.pipedream.api.resources.accounts.requests.AccountsListRequest;
18+
import com.pipedream.api.resources.accounts.requests.AccountsRetrieveRequest;
1719
import com.pipedream.api.resources.accounts.requests.CreateAccountOpts;
18-
import com.pipedream.api.resources.accounts.requests.DeleteAccountsRequest;
19-
import com.pipedream.api.resources.accounts.requests.DeleteByAppAccountsRequest;
20-
import com.pipedream.api.resources.accounts.requests.ListAccountsRequest;
21-
import com.pipedream.api.resources.accounts.requests.RetrieveAccountsRequest;
2220
import com.pipedream.api.types.Account;
2321
import com.pipedream.api.types.ListAccountsResponse;
2422
import java.io.IOException;
@@ -48,21 +46,21 @@ public AsyncRawAccountsClient(ClientOptions clientOptions) {
4846
* Retrieve all connected accounts for the project with optional filtering
4947
*/
5048
public CompletableFuture<BaseClientHttpResponse<SyncPagingIterable<Account>>> list() {
51-
return list(ListAccountsRequest.builder().build());
49+
return list(AccountsListRequest.builder().build());
5250
}
5351

5452
/**
5553
* Retrieve all connected accounts for the project with optional filtering
5654
*/
57-
public CompletableFuture<BaseClientHttpResponse<SyncPagingIterable<Account>>> list(ListAccountsRequest request) {
55+
public CompletableFuture<BaseClientHttpResponse<SyncPagingIterable<Account>>> list(AccountsListRequest request) {
5856
return list(request, null);
5957
}
6058

6159
/**
6260
* Retrieve all connected accounts for the project with optional filtering
6361
*/
6462
public CompletableFuture<BaseClientHttpResponse<SyncPagingIterable<Account>>> list(
65-
ListAccountsRequest request, RequestOptions requestOptions) {
63+
AccountsListRequest request, RequestOptions requestOptions) {
6664
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
6765
.newBuilder()
6866
.addPathSegments("v1/connect")
@@ -118,7 +116,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
118116
ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), ListAccountsResponse.class);
119117
Optional<String> startingAfter =
120118
parsedResponse.getPageInfo().getEndCursor();
121-
ListAccountsRequest nextRequest = ListAccountsRequest.builder()
119+
AccountsListRequest nextRequest = AccountsListRequest.builder()
122120
.from(request)
123121
.after(startingAfter)
124122
.build();
@@ -252,22 +250,22 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
252250
* Get the details for a specific connected account
253251
*/
254252
public CompletableFuture<BaseClientHttpResponse<Account>> retrieve(String accountId) {
255-
return retrieve(accountId, RetrieveAccountsRequest.builder().build());
253+
return retrieve(accountId, AccountsRetrieveRequest.builder().build());
256254
}
257255

258256
/**
259257
* Get the details for a specific connected account
260258
*/
261259
public CompletableFuture<BaseClientHttpResponse<Account>> retrieve(
262-
String accountId, RetrieveAccountsRequest request) {
260+
String accountId, AccountsRetrieveRequest request) {
263261
return retrieve(accountId, request, null);
264262
}
265263

266264
/**
267265
* Get the details for a specific connected account
268266
*/
269267
public CompletableFuture<BaseClientHttpResponse<Account>> retrieve(
270-
String accountId, RetrieveAccountsRequest request, RequestOptions requestOptions) {
268+
String accountId, AccountsRetrieveRequest request, RequestOptions requestOptions) {
271269
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
272270
.newBuilder()
273271
.addPathSegments("v1/connect")
@@ -334,34 +332,26 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
334332
* Remove a connected account and its associated credentials
335333
*/
336334
public CompletableFuture<BaseClientHttpResponse<Void>> delete(String accountId) {
337-
return delete(accountId, DeleteAccountsRequest.builder().build());
335+
return delete(accountId, null);
338336
}
339337

340338
/**
341339
* Remove a connected account and its associated credentials
342340
*/
343-
public CompletableFuture<BaseClientHttpResponse<Void>> delete(String accountId, DeleteAccountsRequest request) {
344-
return delete(accountId, request, null);
345-
}
346-
347-
/**
348-
* Remove a connected account and its associated credentials
349-
*/
350-
public CompletableFuture<BaseClientHttpResponse<Void>> delete(
351-
String accountId, DeleteAccountsRequest request, RequestOptions requestOptions) {
341+
public CompletableFuture<BaseClientHttpResponse<Void>> delete(String accountId, RequestOptions requestOptions) {
352342
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
353343
.newBuilder()
354344
.addPathSegments("v1/connect")
355345
.addPathSegment(clientOptions.projectId())
356346
.addPathSegments("accounts")
357347
.addPathSegment(accountId)
358348
.build();
359-
Request.Builder _requestBuilder = new Request.Builder()
349+
Request okhttpRequest = new Request.Builder()
360350
.url(httpUrl)
361351
.method("DELETE", null)
362352
.headers(Headers.of(clientOptions.headers(requestOptions)))
363-
.addHeader("Accept", "application/json");
364-
Request okhttpRequest = _requestBuilder.build();
353+
.addHeader("Accept", "application/json")
354+
.build();
365355
OkHttpClient client = clientOptions.httpClient();
366356
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
367357
client = clientOptions.httpClientWithTimeout(requestOptions);
@@ -408,22 +398,13 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
408398
* Remove all connected accounts for a specific app
409399
*/
410400
public CompletableFuture<BaseClientHttpResponse<Void>> deleteByApp(String appId) {
411-
return deleteByApp(appId, DeleteByAppAccountsRequest.builder().build());
401+
return deleteByApp(appId, null);
412402
}
413403

414404
/**
415405
* Remove all connected accounts for a specific app
416406
*/
417-
public CompletableFuture<BaseClientHttpResponse<Void>> deleteByApp(
418-
String appId, DeleteByAppAccountsRequest request) {
419-
return deleteByApp(appId, request, null);
420-
}
421-
422-
/**
423-
* Remove all connected accounts for a specific app
424-
*/
425-
public CompletableFuture<BaseClientHttpResponse<Void>> deleteByApp(
426-
String appId, DeleteByAppAccountsRequest request, RequestOptions requestOptions) {
407+
public CompletableFuture<BaseClientHttpResponse<Void>> deleteByApp(String appId, RequestOptions requestOptions) {
427408
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
428409
.newBuilder()
429410
.addPathSegments("v1/connect")
@@ -432,12 +413,12 @@ public CompletableFuture<BaseClientHttpResponse<Void>> deleteByApp(
432413
.addPathSegment(appId)
433414
.addPathSegments("accounts")
434415
.build();
435-
Request.Builder _requestBuilder = new Request.Builder()
416+
Request okhttpRequest = new Request.Builder()
436417
.url(httpUrl)
437418
.method("DELETE", null)
438419
.headers(Headers.of(clientOptions.headers(requestOptions)))
439-
.addHeader("Accept", "application/json");
440-
Request okhttpRequest = _requestBuilder.build();
420+
.addHeader("Accept", "application/json")
421+
.build();
441422
OkHttpClient client = clientOptions.httpClient();
442423
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
443424
client = clientOptions.httpClientWithTimeout(requestOptions);

0 commit comments

Comments
 (0)