Skip to content

Commit a80ce88

Browse files
committed
requested fixes
1 parent e621070 commit a80ce88

File tree

13 files changed

+128
-131
lines changed

13 files changed

+128
-131
lines changed

.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<attribute name="test" value="true"/>
1414
</attributes>
1515
</classpathentry>
16-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
16+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15">
1717
<attributes>
1818
<attribute name="maven.pomderived" value="true"/>
1919
</attributes>

.factorypath

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,5 @@
8686
<factorypathentry kind="VARJAR" id="M2_REPO/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.jar" enabled="true" runInBatchMode="false"/>
8787
<factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/dataformat/jackson-dataformat-csv/2.13.1/jackson-dataformat-csv-2.13.1.jar" enabled="true" runInBatchMode="false"/>
8888
<factorypathentry kind="VARJAR" id="M2_REPO/com/brsanthu/migbase64/2.2/migbase64-2.2.jar" enabled="true" runInBatchMode="false"/>
89-
<factorypathentry kind="VARJAR" id="M2_REPO/com/docusign/docusign-rooms-java/1.1.0-RC1/docusign-rooms-java-1.1.0-RC1.jar" enabled="true" runInBatchMode="false"/>
90-
<factorypathentry kind="VARJAR" id="M2_REPO/com/docusign/docusign-click-java/1.0.0-BETA/docusign-click-java-1.0.0-BETA.jar" enabled="true" runInBatchMode="false"/>
91-
<factorypathentry kind="VARJAR" id="M2_REPO/com/docusign/docusign-monitor-java/1.0.0-BETA/docusign-monitor-java-1.0.0-BETA.jar" enabled="true" runInBatchMode="false"/>
92-
<factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.20/lombok-1.18.20.jar" enabled="true" runInBatchMode="false"/>
89+
<factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.24/lombok-1.18.24.jar" enabled="true" runInBatchMode="false"/>
9390
</factorypath>

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ src/main/resources/application.json
4343

4444
# according to gitignore.io this shouldnt be shared
4545
.factorypath
46+
src/main/resources/private.key

.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
4242
org.eclipse.jdt.core.compiler.codegen.lambda.genericSignature=do not generate
4343
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
4444
org.eclipse.jdt.core.compiler.codegen.shareCommonFinallyBlocks=disabled
45-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
45+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=15
4646
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
47-
org.eclipse.jdt.core.compiler.compliance=11
47+
org.eclipse.jdt.core.compiler.compliance=15
4848
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
4949
org.eclipse.jdt.core.compiler.debug.localVariable=generate
5050
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -169,7 +169,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
169169
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
170170
org.eclipse.jdt.core.compiler.processAnnotations=enabled
171171
org.eclipse.jdt.core.compiler.release=disabled
172-
org.eclipse.jdt.core.compiler.source=11
172+
org.eclipse.jdt.core.compiler.source=15
173173
org.eclipse.jdt.core.compiler.storeAnnotations=disabled
174174
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
175175
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

pom.xml

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@
1717
<name>MyMedicalRecords Sample App</name>
1818

1919
<properties>
20-
<java.version>11</java.version>
20+
<java.version>15</java.version>
2121
<oauth2.version>2.6.2</oauth2.version>
2222
<commonsio.version>2.7</commonsio.version>
2323
<docusign.version>3.13.0-RC1</docusign.version>
24-
<rooms.version>1.1.0-RC1</rooms.version>
25-
<click.version>1.0.0-BETA</click.version>
26-
<monitor.version>1.0.0-BETA</monitor.version>
2724
</properties>
2825

2926
<dependencies>
@@ -80,29 +77,11 @@
8077
<artifactId>docusign-esign-java</artifactId>
8178
<version>${docusign.version}</version>
8279
</dependency>
83-
84-
<dependency>
85-
<groupId>com.docusign</groupId>
86-
<artifactId>docusign-rooms-java</artifactId>
87-
<version>${rooms.version}</version>
88-
</dependency>
89-
90-
<dependency>
91-
<groupId>com.docusign</groupId>
92-
<artifactId>docusign-click-java</artifactId>
93-
<version>${click.version}</version>
94-
</dependency>
95-
96-
<dependency>
97-
<groupId>com.docusign</groupId>
98-
<artifactId>docusign-monitor-java</artifactId>
99-
<version>${monitor.version}</version>
100-
</dependency>
101-
80+
10281
<dependency>
10382
<groupId>org.projectlombok</groupId>
10483
<artifactId>lombok</artifactId>
105-
<version>1.18.20</version>
84+
<version>1.18.24</version>
10685
<scope>compile</scope>
10786
</dependency>
10887
</dependencies>

pom.xml.versionsBackup

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.springframework.boot</groupId>
7+
<artifactId>spring-boot-starter-parent</artifactId>
8+
<version>2.6.2</version>
9+
<relativePath/>
10+
</parent>
11+
12+
<groupId>com.docusign</groupId>
13+
<artifactId>code-examples-java</artifactId>
14+
<version>1.0-SNAPSHOT</version>
15+
<packaging>war</packaging>
16+
17+
<name>MyMedicalRecords Sample App</name>
18+
19+
<properties>
20+
<java.version>15</java.version>
21+
<oauth2.version>2.6.2</oauth2.version>
22+
<commonsio.version>2.7</commonsio.version>
23+
<docusign.version>3.13.0-RC1</docusign.version>
24+
</properties>
25+
26+
<dependencies>
27+
<dependency>
28+
<groupId>org.springframework.boot</groupId>
29+
<artifactId>spring-boot-starter-security</artifactId>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.springframework.boot</groupId>
33+
<artifactId>spring-boot-starter-web</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.springframework.security.oauth.boot</groupId>
37+
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
38+
<version>${oauth2.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.commons</groupId>
42+
<artifactId>commons-lang3</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.freemarker</groupId>
46+
<artifactId>freemarker</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>com.google.code.gson</groupId>
50+
<artifactId>gson</artifactId>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>com.fasterxml.jackson.datatype</groupId>
55+
<artifactId>jackson-datatype-joda</artifactId>
56+
</dependency>
57+
58+
<!-- JSTL -->
59+
<dependency>
60+
<groupId>javax.servlet</groupId>
61+
<artifactId>jstl</artifactId>
62+
</dependency>
63+
<!-- To compile JSP files -->
64+
<dependency>
65+
<groupId>org.apache.tomcat.embed</groupId>
66+
<artifactId>tomcat-embed-jasper</artifactId>
67+
<scope>provided</scope>
68+
</dependency>
69+
70+
<dependency>
71+
<groupId>commons-io</groupId>
72+
<artifactId>commons-io</artifactId>
73+
<version>${commonsio.version}</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>com.docusign</groupId>
77+
<artifactId>docusign-esign-java</artifactId>
78+
<version>${docusign.version}</version>
79+
</dependency>
80+
81+
<dependency>
82+
<groupId>org.projectlombok</groupId>
83+
<artifactId>lombok</artifactId>
84+
<version>1.18.20</version>
85+
<scope>compile</scope>
86+
</dependency>
87+
</dependencies>
88+
89+
<build>
90+
<plugins>
91+
<plugin>
92+
<groupId>org.springframework.boot</groupId>
93+
<artifactId>spring-boot-maven-plugin</artifactId>
94+
<configuration>
95+
<executable>true</executable>
96+
</configuration>
97+
</plugin>
98+
</plugins>
99+
</build>
100+
101+
</project>
1 Byte
Binary file not shown.

src/main/resources/public/assets/style.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,8 @@ a.done {
403403
color: whitesmoke;
404404
}
405405
a.cta.learnMore {
406-
padding-right:5rem;
406+
padding-right: 5rem;
407+
padding-left: 5rem;
407408
}
408409

409410
a.cta {
@@ -682,6 +683,7 @@ p.financSub {
682683
position: absolute;
683684
display: initial;
684685
left: 44%;
686+
margin-bottom: 40px;
685687
}
686688

687689
.resContainer {
@@ -710,7 +712,7 @@ p.financSub {
710712
}
711713

712714
.bottomCopy {
713-
bottom: -12rem;
715+
bottom: -10rem;
714716
position: absolute;
715717
display: initial;
716718
}

src/main/webapp/WEB-INF/templates/views/index.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<div class="buttonGroup">
3333
<button type="button" class="tryIt" onclick="window.location.href='/patientdocs'"> Try the App </button>
34-
<button type="button" class="tryItSrc" onclick="window.location.href='https:\/\/github.com/docusign/sample-app-mymedicalrecords-java'"> More Info</button>
34+
<button type="button" class="tryItSrc" onclick=" window.open('http://github.com/docusign/sample-app-mymedicalrecords-java','_blank')"> More Info</button>
3535
</div>
3636

3737

src/main/webapp/WEB-INF/templates/views/pages/examples/consentforms.jsp

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<h4>Code Flow:</h4>
8080

8181

82-
<p>View source files <a style="color:whitesmoke" href="https://github.com/docusign/sample-app-mymedicalrecords-java/blob/master/src/main/java/com/docusign/controller/examples/ConsentForms.java">consentform.java</a> and <a style="color:whitesmoke" href="https://github.com/docusign/sample-app-mymedicalrecords-java/blob/master/src/main/java/com/docusign/controller/common/ds/EnvelopeHelpers.java">EnvelopeHelpers.java</a> on Github.
82+
<p>View source files <a style="color:whitesmoke" target="_blank" href="https://github.com/docusign/sample-app-mymedicalrecords-java/blob/master/src/main/java/com/docusign/controller/examples/ConsentForms.java">consentform.java</a> and <a style="color:whitesmoke" href="https://github.com/docusign/sample-app-mymedicalrecords-java/blob/master/src/main/java/com/docusign/controller/common/ds/EnvelopeHelpers.java" target="_blank" >EnvelopeHelpers.java</a> on GitHub.
8383

8484

8585

@@ -100,69 +100,17 @@
100100

101101
<h4>Step 2</h4>
102102

103-
<p>Specifically, within that envelope, we need to handle SMS notifications. Here's how we can accomplish that: </p>
104-
105-
106-
<pre style="color:#2ef69b">
107-
108-
...
109-
......
110-
.........
111-
112-
RecipientAdditionalNotification smsNotif = new RecipientAdditionalNotification();
113-
smsNotif.setSecondaryDeliveryMethod("SMS");
114-
RecipientAdditionalNotification ccSmsNotif = new RecipientAdditionalNotification();
115-
ccSmsNotif.setSecondaryDeliveryMethod("SMS");
116-
117-
RecipientPhoneNumber phoneNumber = new RecipientPhoneNumber();
118-
phoneNumber.setCountryCode(args.getCountryCode());
119-
phoneNumber.setNumber(args.getPhoneNumber());
120-
smsNotif.phoneNumber(phoneNumber);
121-
signer.setAdditionalNotifications(Arrays.asList(smsNotif));
122-
123-
RecipientPhoneNumber ccPhoneNumber = new RecipientPhoneNumber();
124-
ccPhoneNumber.setCountryCode(args.getCcCountryCode());
125-
ccPhoneNumber.setNumber(args.getCcPhoneNumber());
126-
ccSmsNotif.phoneNumber(ccPhoneNumber);
127-
cc.setAdditionalNotifications(Arrays.asList(ccSmsNotif));
128-
129-
.........
130-
......
131-
...
132-
133-
</pre>
103+
<p>We then use the phone numbers provided to add additional SMS notifications. </p>
134104

135105

136106
<h4>Step 3</h4>
137107

138-
<p>To complete our envelope definition, we'll need to specify the email subject line, set the recipients (as an Array list, per API specifications) and to set the Documents. Finally, we'll set the status to 'sent' to send the envelope:</p>
139-
140-
141-
<pre style="color:#2ef69b">
142-
143-
...
144-
......
145-
.........
146-
EnvelopeDefinition envelope = new EnvelopeDefinition();
147-
148-
envelope.setEmailSubject("Please sign this consent form");
149-
envelope.setDocuments(Arrays.asList(EnvelopeHelpers.createDocumentFromFile(PDF_DOCUMENT_FILE_NAME, PDF_DOCUMENT_NAME,"1")));
150-
envelope.setRecipients(EnvelopeHelpers.createRecipients(signer, cc));
151-
152-
envelope.setStatus(args.getStatus());
153-
154-
return envelope;
155-
156-
</pre>
108+
<p>To complete our envelope definition, we'll need to specify the email subject line, set the recipients (as an Array list, per API specifications) and to set the Documents. Finally, we'll set the status to 'sent' to send the envelope.</p>
157109

158110

159111
<h4>Step 4</h4>
160112

161113
<p>To send an envelope through the DocuSign eSignature API, we'll need the account ID of the user and an access token, which was generated earlier upon opening the form. From there, we'll pass along the envelope that was generated in Step 1. We return the envelope ID as a GET response parameter in the url.
162-
. This is the createEnevelope function that sends off the API call as found on line 62 in ConsentForms.java:</p>
163-
164-
<pre style="color:#2ef69b">
165-
EnvelopeSummary results = envelopesApi.createEnvelope(session.getAccountId(), envelope);
166-
</pre>
114+
. This is the createEnevelope function that sends off the API call as found on line 62 in ConsentForms.java.</p>
167115

168116
</div>

0 commit comments

Comments
 (0)