Skip to content

Commit 2eecb5d

Browse files
balaji1103balaji1103
authored
Merge pull request #169 from docusign/add-http-info
overall code is working.. checked eSignature module and logging the API calls remaining and reset time in the console.
2 parents f20625f + 9324aa3 commit 2eecb5d

90 files changed

Lines changed: 3226 additions & 1574 deletions

File tree

Some content is hidden

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

‎src/main/java/com/docusign/controller/admin/services/AddActiveUserService.java‎

Lines changed: 53 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,63 @@
11
package com.docusign.controller.admin.services;
22

33
import com.docusign.admin.api.UsersApi;
4+
import com.docusign.admin.client.ApiResponse;
45
import com.docusign.admin.model.*;
56

7+
import java.time.Instant;
68
import java.util.ArrayList;
9+
import java.util.List;
10+
import java.util.Map;
711
import java.util.UUID;
812

913
public class AddActiveUserService {
10-
//ds-snippet-start:Admin1Step5
11-
public static NewUserResponse createNewActiveUser(
12-
String groupId,
13-
String profileId,
14-
String email,
15-
String userName,
16-
String firstName,
17-
String lastName,
18-
UsersApi usersApi,
19-
UUID organizationId,
20-
UUID accountId) throws Exception
21-
{
22-
java.util.List<GroupRequest> groups = new ArrayList<>();
23-
groups.add(new GroupRequest().id(Long.valueOf(groupId)));
24-
25-
// Fill the request with data from the form
26-
NewUserRequest accountUserRequest = new NewUserRequest()
27-
.defaultAccountId(accountId)
28-
.addAccountsItem(
29-
new NewUserRequestAccountProperties()
30-
.id(accountId)
31-
.permissionProfile(
32-
new PermissionProfileRequest()
33-
.id(Long.valueOf(profileId))
34-
)
35-
.groups(groups)
36-
)
37-
.email(email)
38-
.userName(userName)
39-
.firstName(firstName)
40-
.lastName(lastName)
41-
.autoActivateMemberships(true);
42-
//ds-snippet-end:Admin1Step5
43-
44-
//ds-snippet-start:Admin1Step6
45-
return usersApi.createUser(organizationId, accountUserRequest);
46-
//ds-snippet-end:Admin1Step6
47-
}
14+
//ds-snippet-start:Admin1Step5
15+
public static NewUserResponse createNewActiveUser(
16+
String groupId,
17+
String profileId,
18+
String email,
19+
String userName,
20+
String firstName,
21+
String lastName,
22+
UsersApi usersApi,
23+
UUID organizationId,
24+
UUID accountId) throws Exception {
25+
java.util.List<GroupRequest> groups = new ArrayList<>();
26+
groups.add(new GroupRequest().id(Long.valueOf(groupId)));
27+
28+
// Fill the request with data from the form
29+
NewUserRequest accountUserRequest = new NewUserRequest()
30+
.defaultAccountId(accountId)
31+
.addAccountsItem(
32+
new NewUserRequestAccountProperties()
33+
.id(accountId)
34+
.permissionProfile(
35+
new PermissionProfileRequest()
36+
.id(Long.valueOf(
37+
profileId)))
38+
.groups(groups))
39+
.email(email)
40+
.userName(userName)
41+
.firstName(firstName)
42+
.lastName(lastName)
43+
.autoActivateMemberships(true);
44+
//ds-snippet-end:Admin1Step5
45+
46+
//ds-snippet-start:Admin1Step6
47+
ApiResponse<NewUserResponse> response = usersApi.createUserWithHttpInfo(organizationId,
48+
accountUserRequest);
49+
50+
Map<String, List<String>> headers = response.getHeaders();
51+
List<String> remaining = headers.get("X-RateLimit-Remaining");
52+
List<String> reset = headers.get("X-RateLimit-Reset");
53+
54+
if (remaining != null & reset != null) {
55+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
56+
System.out.println("API calls remaining: " + remaining);
57+
System.out.println("Next Reset: " + resetInstant);
58+
}
59+
60+
return response.getData();
61+
//ds-snippet-end:Admin1Step6
62+
}
4863
}

‎src/main/java/com/docusign/controller/admin/services/AuditUsersService.java‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22

33
import com.docusign.admin.api.UsersApi;
44
import com.docusign.admin.client.ApiException;
5+
import com.docusign.admin.client.ApiResponse;
56
import com.docusign.admin.model.OrganizationUserResponse;
67
import com.docusign.admin.model.OrganizationUsersResponse;
78
import com.docusign.admin.model.UserDrilldownResponse;
89
import com.docusign.admin.model.UsersDrilldownResponse;
910

1011
import java.text.SimpleDateFormat;
12+
import java.time.Instant;
1113
import java.util.ArrayList;
1214
import java.util.Date;
15+
import java.util.List;
16+
import java.util.Map;
1317
import java.util.TimeZone;
1418
import java.util.UUID;
1519

@@ -21,8 +25,7 @@ public class AuditUsersService {
2125
public static ArrayList<UserDrilldownResponse> auditUsers(
2226
UsersApi usersApi,
2327
UUID organizationId,
24-
UUID accountId
25-
) throws ApiException {
28+
UUID accountId) throws ApiException {
2629
ArrayList<UserDrilldownResponse> auditedUsers = new ArrayList<>();
2730

2831
//ds-snippet-start:Admin5Step3
@@ -35,19 +38,41 @@ public static ArrayList<UserDrilldownResponse> auditUsers(
3538
Integer tenDaysBeforeToday = 1000 * 60 * 60 * 24 * 10;
3639
String nowAsISO = df.format(new Date(System.currentTimeMillis() - tenDaysBeforeToday));
3740
options.setLastModifiedSince(nowAsISO);
38-
OrganizationUsersResponse modifiedUsers = usersApi.getUsers(organizationId, options);
41+
ApiResponse<OrganizationUsersResponse> modifiedUsers = usersApi.getUsersWithHttpInfo(organizationId, options);
42+
43+
Map<String, List<String>> headers = modifiedUsers.getHeaders();
44+
List<String> remaining = headers.get("X-RateLimit-Remaining");
45+
List<String> reset = headers.get("X-RateLimit-Reset");
46+
47+
if (remaining != null & reset != null) {
48+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
49+
System.out.println("API calls remaining: " + remaining);
50+
System.out.println("Next Reset: " + resetInstant);
51+
}
3952
//ds-snippet-end:Admin5Step3
4053

4154
//ds-snippet-start:Admin5Step5
42-
for (OrganizationUserResponse user : modifiedUsers.getUsers()) {
55+
for (OrganizationUserResponse user : modifiedUsers.getData().getUsers()) {
4356
//ds-snippet-end:Admin5Step5
4457
//ds-snippet-start:Admin5Step4
4558
UsersApi.GetUserProfilesOptions profilesOptions = usersApi.new GetUserProfilesOptions();
4659
profilesOptions.setEmail(user.getEmail());
4760
//ds-snippet-end:Admin5Step4
4861
//ds-snippet-start:Admin5Step5
49-
UsersDrilldownResponse res = usersApi.getUserProfiles(organizationId, profilesOptions);
50-
auditedUsers.add(res.getUsers().get(0));
62+
ApiResponse<UsersDrilldownResponse> res = usersApi.getUserProfilesWithHttpInfo(organizationId,
63+
profilesOptions);
64+
65+
headers = res.getHeaders();
66+
remaining = headers.get("X-RateLimit-Remaining");
67+
reset = headers.get("X-RateLimit-Reset");
68+
69+
if (remaining != null & reset != null) {
70+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
71+
System.out.println("API calls remaining: " + remaining);
72+
System.out.println("Next Reset: " + resetInstant);
73+
}
74+
75+
auditedUsers.add(res.getData().getUsers().get(0));
5176
}
5277
//ds-snippet-end:Admin5Step5
5378

‎src/main/java/com/docusign/controller/admin/services/BulkExportUserDataService.java‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.docusign.admin.api.BulkExportsApi;
44
import com.docusign.admin.client.ApiException;
5+
import com.docusign.admin.client.ApiResponse;
56
import com.docusign.admin.model.OrganizationExportRequest;
67
import com.docusign.admin.model.OrganizationExportResponse;
78
import com.docusign.admin.model.OrganizationExportsResponse;
@@ -18,29 +19,71 @@
1819
import java.net.URISyntaxException;
1920
import java.net.URL;
2021
import java.nio.file.Paths;
22+
import java.time.Instant;
23+
import java.util.List;
24+
import java.util.Map;
2125
import java.util.Objects;
2226
import java.util.UUID;
2327

2428
public class BulkExportUserDataService {
2529
public static OrganizationExportsResponse bulkExportsUserData(
2630
BulkExportsApi bulkExportsApi,
2731
UUID organizationId) throws ApiException {
28-
return bulkExportsApi.getUserListExports(organizationId);
32+
ApiResponse<OrganizationExportsResponse> response = bulkExportsApi
33+
.getUserListExportsWithHttpInfo(organizationId);
34+
35+
Map<String, List<String>> headers = response.getHeaders();
36+
List<String> remaining = headers.get("X-RateLimit-Remaining");
37+
List<String> reset = headers.get("X-RateLimit-Reset");
38+
39+
if (remaining != null & reset != null) {
40+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
41+
System.out.println("API calls remaining: " + remaining);
42+
System.out.println("Next Reset: " + resetInstant);
43+
}
44+
45+
return response.getData();
2946
}
3047

3148
public static OrganizationExportResponse bulkExportUserData(
3249
BulkExportsApi bulkExportsApi,
3350
UUID organizationId,
3451
UUID exportId) throws ApiException {
35-
return bulkExportsApi.getUserListExport(organizationId, exportId);
52+
ApiResponse<OrganizationExportResponse> response = bulkExportsApi.getUserListExportWithHttpInfo(organizationId,
53+
exportId);
54+
55+
Map<String, List<String>> headers = response.getHeaders();
56+
List<String> remaining = headers.get("X-RateLimit-Remaining");
57+
List<String> reset = headers.get("X-RateLimit-Reset");
58+
59+
if (remaining != null & reset != null) {
60+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
61+
System.out.println("API calls remaining: " + remaining);
62+
System.out.println("Next Reset: " + resetInstant);
63+
}
64+
65+
return response.getData();
3666
}
3767

3868
public static OrganizationExportResponse createUserListExport(
3969
BulkExportsApi bulkExportsApi,
4070
UUID organizationId) throws ApiException {
4171
OrganizationExportRequest request = new OrganizationExportRequest();
4272
request.setType("organization_memberships_export");
43-
return bulkExportsApi.createUserListExport(organizationId, request);
73+
ApiResponse<OrganizationExportResponse> response = bulkExportsApi
74+
.createUserListExportWithHttpInfo(organizationId, request);
75+
76+
Map<String, List<String>> headers = response.getHeaders();
77+
List<String> remaining = headers.get("X-RateLimit-Remaining");
78+
List<String> reset = headers.get("X-RateLimit-Reset");
79+
80+
if (remaining != null & reset != null) {
81+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
82+
System.out.println("API calls remaining: " + remaining);
83+
System.out.println("Next Reset: " + resetInstant);
84+
}
85+
86+
return response.getData();
4487
}
4588

4689
public static String moveUserListExportToFile(

‎src/main/java/com/docusign/controller/admin/services/BulkImportUserDataService.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package com.docusign.controller.admin.services;
22

33
import com.docusign.admin.api.BulkImportsApi;
4+
import com.docusign.admin.client.ApiResponse;
45
import com.docusign.admin.model.OrganizationImportResponse;
56

67
import java.nio.charset.StandardCharsets;
8+
import java.time.Instant;
9+
import java.util.List;
10+
import java.util.Map;
711
import java.util.UUID;
812

913
public class BulkImportUserDataService {
@@ -12,14 +16,26 @@ public class BulkImportUserDataService {
1216
public static OrganizationImportResponse bulkImportUserData(
1317
BulkImportsApi bulkImportsApi,
1418
UUID organizationId,
15-
UUID accountId
16-
) throws Exception {
19+
UUID accountId) throws Exception {
1720
// Make sure you're using a verified domain for auto-activation to work properly
1821
//ds-snippet-start:Admin4Step3
1922
String csvUserData = String.format(BULK_IMPORT_TEXT, accountId, accountId);
2023
byte[] csvDataInBytes = csvUserData.getBytes(StandardCharsets.UTF_8);
2124

22-
return bulkImportsApi.createBulkImportSingleAccountAddUsersRequest(organizationId, accountId, csvDataInBytes);
25+
ApiResponse<OrganizationImportResponse> response = bulkImportsApi
26+
.createBulkImportSingleAccountAddUsersRequestWithHttpInfo(organizationId, accountId, csvDataInBytes);
27+
28+
Map<String, List<String>> headers = response.getHeaders();
29+
List<String> remaining = headers.get("X-RateLimit-Remaining");
30+
List<String> reset = headers.get("X-RateLimit-Reset");
31+
32+
if (remaining != null & reset != null) {
33+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
34+
System.out.println("API calls remaining: " + remaining);
35+
System.out.println("Next Reset: " + resetInstant);
36+
}
37+
38+
return response.getData();
2339
//ds-snippet-end:Admin4Step3
2440
}
2541
}

‎src/main/java/com/docusign/controller/admin/services/CheckImportRequestStatusService.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,34 @@
11
package com.docusign.controller.admin.services;
22

33
import com.docusign.admin.api.BulkImportsApi;
4+
import com.docusign.admin.client.ApiResponse;
45
import com.docusign.admin.model.OrganizationImportResponse;
56

7+
import java.time.Instant;
8+
import java.util.List;
9+
import java.util.Map;
610
import java.util.UUID;
711

812
public class CheckImportRequestStatusService {
913
public static OrganizationImportResponse checkRequestStatus(
1014
BulkImportsApi bulkImportsApi,
1115
UUID organizationId,
12-
UUID importId
13-
) throws Exception {
16+
UUID importId) throws Exception {
1417
// Step 4a start
15-
return bulkImportsApi.getBulkUserImportRequest(organizationId, importId);
18+
ApiResponse<OrganizationImportResponse> response = bulkImportsApi
19+
.getBulkUserImportRequestWithHttpInfo(organizationId, importId);
20+
21+
Map<String, List<String>> headers = response.getHeaders();
22+
List<String> remaining = headers.get("X-RateLimit-Remaining");
23+
List<String> reset = headers.get("X-RateLimit-Reset");
24+
25+
if (remaining != null & reset != null) {
26+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
27+
System.out.println("API calls remaining: " + remaining);
28+
System.out.println("Next Reset: " + resetInstant);
29+
}
30+
31+
return response.getData();
1632
// Step 4a end
1733
}
1834
}

‎src/main/java/com/docusign/controller/admin/services/CheckRequestStatusService.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
package com.docusign.controller.admin.services;
22

33
import com.docusign.admin.api.BulkExportsApi;
4+
import com.docusign.admin.client.ApiResponse;
45
import com.docusign.admin.model.OrganizationExportResponse;
56

7+
import java.time.Instant;
8+
import java.util.List;
9+
import java.util.Map;
610
import java.util.UUID;
711

812
public class CheckRequestStatusService {
913
public static OrganizationExportResponse checkRequestStatus(
1014
BulkExportsApi bulkExportsApi,
1115
UUID organizationId,
12-
UUID exportId
13-
) throws Exception {
14-
return bulkExportsApi.getUserListExport(organizationId, exportId);
16+
UUID exportId) throws Exception {
17+
ApiResponse<OrganizationExportResponse> response = bulkExportsApi.getUserListExportWithHttpInfo(organizationId,
18+
exportId);
19+
20+
Map<String, List<String>> headers = response.getHeaders();
21+
List<String> remaining = headers.get("X-RateLimit-Remaining");
22+
List<String> reset = headers.get("X-RateLimit-Reset");
23+
24+
if (remaining != null & reset != null) {
25+
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
26+
System.out.println("API calls remaining: " + remaining);
27+
System.out.println("Next Reset: " + resetInstant);
28+
}
29+
30+
return response.getData();
1531
}
1632
}

0 commit comments

Comments
 (0)