Skip to content

Commit 8ac7782

Browse files
committed
fixes after the code review
1 parent da65f00 commit 8ac7782

50 files changed

Lines changed: 103 additions & 266 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/DSConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public class DSConfiguration {
3535

3636
public Boolean isConsentRedirectActivated = false;
3737

38-
private boolean additionalRedirect = false;
38+
private boolean additionalRedirect;
3939

40-
private boolean shareAccessExampleScenario = false;
40+
private boolean shareAccessExampleScenario;
4141

4242
private String principalUserId;
4343

‎src/main/java/com/docusign/EG001ControllerEmbeddedSigning.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ public class EG001ControllerEmbeddedSigning extends AbstractEsignatureController
3737
private static final int ANCHOR_OFFSET_Y = 20;
3838
private static final int ANCHOR_OFFSET_X = 10;
3939
private static final String SIGNER_CLIENT_ID = "1000";
40-
private final Session session;
41-
private final User user;
4240

4341
@Autowired
4442
public EG001ControllerEmbeddedSigning(DSConfiguration config, Session session, User user){
45-
super(config, Boolean.valueOf(config.getQuickACG()) ? "quickEmbeddedSigning" : "eg001");
46-
this.session = session;
47-
this.user = user;
43+
super(config, Boolean.valueOf(config.getQuickACG()) ? "quickEmbeddedSigning" : "eg001", session, user);
4844
}
4945

5046
@Override

‎src/main/java/com/docusign/controller/eSignature/examples/AbstractEsignatureController.java‎

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

33
import com.docusign.DSConfiguration;
44
import com.docusign.core.controller.AbstractController;
5+
import com.docusign.core.model.Session;
6+
import com.docusign.core.model.User;
57
import com.docusign.esign.api.AccountsApi;
68
import com.docusign.esign.api.EnvelopesApi;
79
import com.docusign.esign.api.TemplatesApi;
@@ -21,10 +23,14 @@ public abstract class AbstractEsignatureController extends AbstractController {
2123

2224
protected static final String MODEL_ENVELOPE_OK = "envelopeOk";
2325
protected static final String MODEL_TEMPLATE_OK = "templateOk";
26+
protected final Session session;
27+
protected final User user;
2428
private static final String EXAMPLE_PAGES_PATH = "pages/esignature/examples/";
2529

26-
public AbstractEsignatureController(DSConfiguration config, String exampleName) {
30+
public AbstractEsignatureController(DSConfiguration config, String exampleName, Session session, User user) {
2731
super(config, exampleName);
32+
this.session = session;
33+
this.user = user;
2834
}
2935

3036
protected String getExamplePagesPath() {
@@ -49,7 +55,7 @@ protected ApiClient createApiClient(String basePath, String userAccessToken) {
4955
* @param userAccessToken user's access token
5056
* @return an instance of the {@link OAuth.UserInfo}
5157
*/
52-
protected OAuth.UserInfo getCurrentUserId(String basePath, String userAccessToken) throws ApiException {
58+
protected OAuth.UserInfo getCurrentUserInfo(String basePath, String userAccessToken) throws ApiException {
5359
ApiClient apiClient = createApiClient(basePath, userAccessToken);
5460
return apiClient.getUserInfo(userAccessToken);
5561
}

‎src/main/java/com/docusign/controller/eSignature/examples/EG002ControllerSigningViaEmail.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,9 @@
2828
@RequestMapping("/eg002")
2929
public class EG002ControllerSigningViaEmail extends AbstractEsignatureController {
3030

31-
private final Session session;
32-
private final User user;
33-
3431
@Autowired
3532
public EG002ControllerSigningViaEmail(DSConfiguration config, Session session, User user) {
36-
super(config, "eg002");
37-
this.session = session;
38-
this.user = user;
33+
super(config, "eg002", session, user);
3934
}
4035

4136
@Override

‎src/main/java/com/docusign/controller/eSignature/examples/EG003ControllerListEnvelopes.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,9 @@
2626
@RequestMapping("/eg003")
2727
public class EG003ControllerListEnvelopes extends AbstractEsignatureController {
2828

29-
private final Session session;
30-
private final User user;
31-
3229
@Autowired
3330
public EG003ControllerListEnvelopes(DSConfiguration config, Session session, User user) {
34-
super(config, "eg003");
35-
this.session = session;
36-
this.user = user;
31+
super(config, "eg003", session, user);
3732
}
3833

3934
@Override

‎src/main/java/com/docusign/controller/eSignature/examples/EG004ControllerEnvelopeInfo.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,9 @@
3030
@RequestMapping("/eg004")
3131
public class EG004ControllerEnvelopeInfo extends AbstractEsignatureController {
3232

33-
private final Session session;
34-
private final User user;
35-
3633
@Autowired
3734
public EG004ControllerEnvelopeInfo(DSConfiguration config, Session session, User user) {
38-
super(config, "eg004");
39-
this.session = session;
40-
this.user = user;
35+
super(config, "eg004", session, user);
4136
}
4237

4338
@Override

‎src/main/java/com/docusign/controller/eSignature/examples/EG005ControllerEnvelopeRecipients.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,9 @@
2626
@RequestMapping("/eg005")
2727
public class EG005ControllerEnvelopeRecipients extends AbstractEsignatureController {
2828

29-
private final Session session;
30-
private final User user;
31-
3229
@Autowired
3330
public EG005ControllerEnvelopeRecipients(DSConfiguration config, Session session, User user) {
34-
super(config, "eg005");
35-
this.session = session;
36-
this.user = user;
31+
super(config, "eg005", session, user);
3732
}
3833

3934
@Override

‎src/main/java/com/docusign/controller/eSignature/examples/EG006ControllerEnvelopeDocs.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,9 @@
3434
@RequestMapping("/eg006")
3535
public class EG006ControllerEnvelopeDocs extends AbstractEsignatureController {
3636

37-
private final Session session;
38-
private final User user;
39-
4037
@Autowired
4138
public EG006ControllerEnvelopeDocs(DSConfiguration config, Session session, User user) {
42-
super(config, "eg006");
43-
this.session = session;
44-
this.user = user;
39+
super(config, "eg006", session, user);
4540
}
4641

4742
@Override

‎src/main/java/com/docusign/controller/eSignature/examples/EG007ControllerEnvelopeGetDoc.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,10 @@ public class EG007ControllerEnvelopeGetDoc extends AbstractEsignatureController
3636
private static final String MODEL_DOCUMENT_OPTIONS = "documentOptions";
3737
private static final String HTTP_CONTENT_DISPOSITION_VALUE = "inline;filename=";
3838
private static final String ZIP_EXTENSION = "zip";
39-
private final Session session;
40-
private final User user;
4139

4240
@Autowired
4341
public EG007ControllerEnvelopeGetDoc(DSConfiguration config, Session session, User user) {
44-
super(config, "eg007");
45-
this.session = session;
46-
this.user = user;
42+
super(config, "eg007", session, user);
4743
}
4844

4945
@Override

‎src/main/java/com/docusign/controller/eSignature/examples/EG008ControllerCreateTemplate.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,11 @@
3030
@RequestMapping("/eg008")
3131
public class EG008ControllerCreateTemplate extends AbstractEsignatureController {
3232

33-
private final Session session;
34-
private final User user;
3533
private static final String TEMPLATE_NAME = "Example Signer and CC template";
3634

3735
@Autowired
3836
public EG008ControllerCreateTemplate(DSConfiguration config, Session session, User user) {
39-
super(config, "eg008");
40-
this.session = session;
41-
this.user = user;
37+
super(config, "eg008", session, user);
4238
}
4339

4440
@Override

0 commit comments

Comments
 (0)