Skip to content

Commit f3f3bcb

Browse files
annahiletaannahileta
committed
Fixed the check after testing
1 parent 779ac21 commit f3f3bcb

File tree

88 files changed

+1965
-1838
lines changed

Some content is hidden

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

88 files changed

+1965
-1838
lines changed

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

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,53 @@
1111
import java.util.UUID;
1212

1313
public class AddActiveUserService {
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-
{
26-
java.util.List<GroupRequest> groups = new ArrayList<>();
27-
groups.add(new GroupRequest().id(Long.valueOf(groupId)));
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)));
2827

29-
// Fill the request with data from the form
30-
NewUserRequest accountUserRequest = new NewUserRequest()
31-
.defaultAccountId(accountId)
32-
.addAccountsItem(
33-
new NewUserRequestAccountProperties()
34-
.id(accountId)
35-
.permissionProfile(
36-
new PermissionProfileRequest()
37-
.id(Long.valueOf(profileId))
38-
)
39-
.groups(groups)
40-
)
41-
.email(email)
42-
.userName(userName)
43-
.firstName(firstName)
44-
.lastName(lastName)
45-
.autoActivateMemberships(true);
46-
//ds-snippet-end:Admin1Step5
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
4745

48-
//ds-snippet-start:Admin1Step6
49-
ApiResponse<NewUserResponse> response = usersApi.createUserWithHttpInfo(organizationId, accountUserRequest);
46+
// ds-snippet-start:Admin1Step6
47+
ApiResponse<NewUserResponse> response = usersApi.createUserWithHttpInfo(organizationId,
48+
accountUserRequest);
5049

51-
Map<String, List<String>> headers = response.getHeaders();
52-
List<String> remaining = headers.get("X-RateLimit-Remaining");
53-
List<String> reset = headers.get("X-RateLimit-Reset");
54-
55-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
56-
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
57-
System.out.println("API calls remaining: " + remaining);
58-
System.out.println("Next Reset: " + resetInstant);
59-
}
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+
}
6059

61-
return response.getData();
62-
//ds-snippet-end:Admin1Step6
63-
}
60+
return response.getData();
61+
// ds-snippet-end:Admin1Step6
62+
}
6463
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ public class AuditUsersService {
2525
public static ArrayList<UserDrilldownResponse> auditUsers(
2626
UsersApi usersApi,
2727
UUID organizationId,
28-
UUID accountId
29-
) throws ApiException {
28+
UUID accountId) throws ApiException {
3029
ArrayList<UserDrilldownResponse> auditedUsers = new ArrayList<>();
3130

32-
//ds-snippet-start:Admin5Step3
31+
// ds-snippet-start:Admin5Step3
3332
UsersApi.GetUsersOptions options = usersApi.new GetUsersOptions();
3433
options.setAccountId(accountId);
3534
TimeZone tz = TimeZone.getTimeZone(timeZoneId);
@@ -44,37 +43,38 @@ public static ArrayList<UserDrilldownResponse> auditUsers(
4443
Map<String, List<String>> headers = modifiedUsers.getHeaders();
4544
List<String> remaining = headers.get("X-RateLimit-Remaining");
4645
List<String> reset = headers.get("X-RateLimit-Reset");
47-
48-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
46+
47+
if (remaining != null & reset != null) {
4948
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
5049
System.out.println("API calls remaining: " + remaining);
5150
System.out.println("Next Reset: " + resetInstant);
5251
}
53-
//ds-snippet-end:Admin5Step3
52+
// ds-snippet-end:Admin5Step3
5453

55-
//ds-snippet-start:Admin5Step5
54+
// ds-snippet-start:Admin5Step5
5655
for (OrganizationUserResponse user : modifiedUsers.getData().getUsers()) {
57-
//ds-snippet-end:Admin5Step5
58-
//ds-snippet-start:Admin5Step4
56+
// ds-snippet-end:Admin5Step5
57+
// ds-snippet-start:Admin5Step4
5958
UsersApi.GetUserProfilesOptions profilesOptions = usersApi.new GetUserProfilesOptions();
6059
profilesOptions.setEmail(user.getEmail());
61-
//ds-snippet-end:Admin5Step4
62-
//ds-snippet-start:Admin5Step5
63-
ApiResponse<UsersDrilldownResponse> res = usersApi.getUserProfilesWithHttpInfo(organizationId, profilesOptions);
60+
// ds-snippet-end:Admin5Step4
61+
// ds-snippet-start:Admin5Step5
62+
ApiResponse<UsersDrilldownResponse> res = usersApi.getUserProfilesWithHttpInfo(organizationId,
63+
profilesOptions);
6464

6565
headers = res.getHeaders();
6666
remaining = headers.get("X-RateLimit-Remaining");
6767
reset = headers.get("X-RateLimit-Reset");
68-
69-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
68+
69+
if (remaining != null & reset != null) {
7070
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
7171
System.out.println("API calls remaining: " + remaining);
7272
System.out.println("Next Reset: " + resetInstant);
7373
}
7474

7575
auditedUsers.add(res.getData().getUsers().get(0));
7676
}
77-
//ds-snippet-end:Admin5Step5
77+
// ds-snippet-end:Admin5Step5
7878

7979
return auditedUsers;
8080
}

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ public class BulkExportUserDataService {
2929
public static OrganizationExportsResponse bulkExportsUserData(
3030
BulkExportsApi bulkExportsApi,
3131
UUID organizationId) throws ApiException {
32-
ApiResponse<OrganizationExportsResponse> response = bulkExportsApi.getUserListExportsWithHttpInfo(organizationId);
32+
ApiResponse<OrganizationExportsResponse> response = bulkExportsApi
33+
.getUserListExportsWithHttpInfo(organizationId);
3334

3435
Map<String, List<String>> headers = response.getHeaders();
3536
List<String> remaining = headers.get("X-RateLimit-Remaining");
3637
List<String> reset = headers.get("X-RateLimit-Reset");
37-
38-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
38+
39+
if (remaining != null & reset != null) {
3940
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
4041
System.out.println("API calls remaining: " + remaining);
4142
System.out.println("Next Reset: " + resetInstant);
@@ -48,13 +49,14 @@ public static OrganizationExportResponse bulkExportUserData(
4849
BulkExportsApi bulkExportsApi,
4950
UUID organizationId,
5051
UUID exportId) throws ApiException {
51-
ApiResponse<OrganizationExportResponse> response = bulkExportsApi.getUserListExportWithHttpInfo(organizationId, exportId);
52+
ApiResponse<OrganizationExportResponse> response = bulkExportsApi.getUserListExportWithHttpInfo(organizationId,
53+
exportId);
5254

5355
Map<String, List<String>> headers = response.getHeaders();
5456
List<String> remaining = headers.get("X-RateLimit-Remaining");
5557
List<String> reset = headers.get("X-RateLimit-Reset");
56-
57-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
58+
59+
if (remaining != null & reset != null) {
5860
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
5961
System.out.println("API calls remaining: " + remaining);
6062
System.out.println("Next Reset: " + resetInstant);
@@ -68,13 +70,14 @@ public static OrganizationExportResponse createUserListExport(
6870
UUID organizationId) throws ApiException {
6971
OrganizationExportRequest request = new OrganizationExportRequest();
7072
request.setType("organization_memberships_export");
71-
ApiResponse<OrganizationExportResponse> response = bulkExportsApi.createUserListExportWithHttpInfo(organizationId, request);
73+
ApiResponse<OrganizationExportResponse> response = bulkExportsApi
74+
.createUserListExportWithHttpInfo(organizationId, request);
7275

7376
Map<String, List<String>> headers = response.getHeaders();
7477
List<String> remaining = headers.get("X-RateLimit-Remaining");
7578
List<String> reset = headers.get("X-RateLimit-Reset");
76-
77-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
79+
80+
if (remaining != null & reset != null) {
7881
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
7982
System.out.println("API calls remaining: " + remaining);
8083
System.out.println("Next Reset: " + resetInstant);
@@ -88,7 +91,7 @@ public static String moveUserListExportToFile(
8891
String bearerAuthentication,
8992
String accessToken,
9093
Integer bufferSize) throws IOException, URISyntaxException {
91-
//ds-snippet-start:Admin3Step5
94+
// ds-snippet-start:Admin3Step5
9295
URL request_url = new URL(csvUri);
9396

9497
// Send Web request to download and save the exported CSV data
@@ -123,7 +126,7 @@ public static String moveUserListExportToFile(
123126
outputStream.close();
124127
inputStream.close();
125128
http_conn.disconnect();
126-
//ds-snippet-end:Admin3Step5
129+
// ds-snippet-end:Admin3Step5
127130

128131
return saveFilePath;
129132
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ public class BulkImportUserDataService {
1616
public static OrganizationImportResponse bulkImportUserData(
1717
BulkImportsApi bulkImportsApi,
1818
UUID organizationId,
19-
UUID accountId
20-
) throws Exception {
19+
UUID accountId) throws Exception {
2120
// Make sure you're using a verified domain for auto-activation to work properly
22-
//ds-snippet-start:Admin4Step3
21+
// ds-snippet-start:Admin4Step3
2322
String csvUserData = String.format(BULK_IMPORT_TEXT, accountId, accountId);
2423
byte[] csvDataInBytes = csvUserData.getBytes(StandardCharsets.UTF_8);
2524

26-
ApiResponse<OrganizationImportResponse> response = bulkImportsApi.createBulkImportSingleAccountAddUsersRequestWithHttpInfo(organizationId, accountId, csvDataInBytes);
25+
ApiResponse<OrganizationImportResponse> response = bulkImportsApi
26+
.createBulkImportSingleAccountAddUsersRequestWithHttpInfo(organizationId, accountId, csvDataInBytes);
2727

2828
Map<String, List<String>> headers = response.getHeaders();
2929
List<String> remaining = headers.get("X-RateLimit-Remaining");
3030
List<String> reset = headers.get("X-RateLimit-Reset");
31-
32-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
31+
32+
if (remaining != null & reset != null) {
3333
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
3434
System.out.println("API calls remaining: " + remaining);
3535
System.out.println("Next Reset: " + resetInstant);
3636
}
3737

3838
return response.getData();
39-
//ds-snippet-end:Admin4Step3
39+
// ds-snippet-end:Admin4Step3
4040
}
4141
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ public class CheckImportRequestStatusService {
1313
public static OrganizationImportResponse checkRequestStatus(
1414
BulkImportsApi bulkImportsApi,
1515
UUID organizationId,
16-
UUID importId
17-
) throws Exception {
16+
UUID importId) throws Exception {
1817
// Step 4a start
19-
ApiResponse<OrganizationImportResponse> response = bulkImportsApi.getBulkUserImportRequestWithHttpInfo(organizationId, importId);
18+
ApiResponse<OrganizationImportResponse> response = bulkImportsApi
19+
.getBulkUserImportRequestWithHttpInfo(organizationId, importId);
2020

2121
Map<String, List<String>> headers = response.getHeaders();
2222
List<String> remaining = headers.get("X-RateLimit-Remaining");
2323
List<String> reset = headers.get("X-RateLimit-Reset");
24-
25-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
24+
25+
if (remaining != null & reset != null) {
2626
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
2727
System.out.println("API calls remaining: " + remaining);
2828
System.out.println("Next Reset: " + resetInstant);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public class CheckRequestStatusService {
1313
public static OrganizationExportResponse checkRequestStatus(
1414
BulkExportsApi bulkExportsApi,
1515
UUID organizationId,
16-
UUID exportId
17-
) throws Exception {
18-
ApiResponse<OrganizationExportResponse> response = bulkExportsApi.getUserListExportWithHttpInfo(organizationId, exportId);
16+
UUID exportId) throws Exception {
17+
ApiResponse<OrganizationExportResponse> response = bulkExportsApi.getUserListExportWithHttpInfo(organizationId,
18+
exportId);
1919

2020
Map<String, List<String>> headers = response.getHeaders();
2121
List<String> remaining = headers.get("X-RateLimit-Remaining");
2222
List<String> reset = headers.get("X-RateLimit-Reset");
23-
24-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
23+
24+
if (remaining != null & reset != null) {
2525
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
2626
System.out.println("API calls remaining: " + remaining);
2727
System.out.println("Next Reset: " + resetInstant);

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,38 @@
1616

1717
public class CloneAccountService {
1818
public AssetGroupAccountsResponse getGroupAccounts(
19-
ProvisionAssetGroupApi provisionAssetGroupApi,
20-
UUID organizationId
21-
) throws ApiException {
19+
ProvisionAssetGroupApi provisionAssetGroupApi,
20+
UUID organizationId) throws ApiException {
2221

23-
//ds-snippet-start:Admin12Step3
22+
// ds-snippet-start:Admin12Step3
2423
ProvisionAssetGroupApi.GetAssetGroupAccountsOptions options = provisionAssetGroupApi.new GetAssetGroupAccountsOptions();
2524
options.setCompliant(true);
26-
ApiResponse<AssetGroupAccountsResponse> response = provisionAssetGroupApi.getAssetGroupAccountsWithHttpInfo(organizationId, options);
25+
ApiResponse<AssetGroupAccountsResponse> response = provisionAssetGroupApi
26+
.getAssetGroupAccountsWithHttpInfo(organizationId, options);
2727

2828
Map<String, List<String>> headers = response.getHeaders();
2929
List<String> remaining = headers.get("X-RateLimit-Remaining");
3030
List<String> reset = headers.get("X-RateLimit-Reset");
31-
32-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
31+
32+
if (remaining != null & reset != null) {
3333
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
3434
System.out.println("API calls remaining: " + remaining);
3535
System.out.println("Next Reset: " + resetInstant);
3636
}
3737

3838
return response.getData();
39-
//ds-snippet-end:Admin12Step3
39+
// ds-snippet-end:Admin12Step3
4040
}
4141

4242
public AssetGroupAccountClone getClonedAccount(
43-
ProvisionAssetGroupApi provisionAssetGroupApi,
44-
UUID organizationId,
45-
UUID sourceAccountId,
46-
String targetAccountName,
47-
String targetAccountEmail,
48-
String targetAccountFirstName,
49-
String targetAccountLastName
50-
) throws ApiException {
51-
//ds-snippet-start:Admin12Step4
43+
ProvisionAssetGroupApi provisionAssetGroupApi,
44+
UUID organizationId,
45+
UUID sourceAccountId,
46+
String targetAccountName,
47+
String targetAccountEmail,
48+
String targetAccountFirstName,
49+
String targetAccountLastName) throws ApiException {
50+
// ds-snippet-start:Admin12Step4
5251
String countryCode = "US";
5352

5453
AssetGroupAccountClone accountData = new AssetGroupAccountClone();
@@ -67,22 +66,23 @@ public AssetGroupAccountClone getClonedAccount(
6766
targetAccount.admin(admin);
6867
accountData.setSourceAccount(sourceAccount);
6968
accountData.setTargetAccount(targetAccount);
70-
//ds-snippet-end:Admin12Step4
69+
// ds-snippet-end:Admin12Step4
7170

72-
//ds-snippet-start:Admin12Step5
73-
ApiResponse<AssetGroupAccountClone> response = provisionAssetGroupApi.cloneAssetGroupAccountWithHttpInfo(organizationId, accountData);
71+
// ds-snippet-start:Admin12Step5
72+
ApiResponse<AssetGroupAccountClone> response = provisionAssetGroupApi
73+
.cloneAssetGroupAccountWithHttpInfo(organizationId, accountData);
7474

7575
Map<String, List<String>> headers = response.getHeaders();
7676
List<String> remaining = headers.get("X-RateLimit-Remaining");
7777
List<String> reset = headers.get("X-RateLimit-Reset");
78-
79-
if (remaining != null & reset != null & !remaining.isEmpty() & !reset.isEmpty()) {
78+
79+
if (remaining != null & reset != null) {
8080
Instant resetInstant = Instant.ofEpochSecond(Long.parseLong(reset.get(0)));
8181
System.out.println("API calls remaining: " + remaining);
8282
System.out.println("Next Reset: " + resetInstant);
8383
}
8484

8585
return response.getData();
86-
//ds-snippet-end:Admin12Step5
86+
// ds-snippet-end:Admin12Step5
8787
}
8888
}

0 commit comments

Comments
 (0)