fix ex38 error handling and add WhatsApp to ex37 (#115)

* show error message displayed and roll forward admin api sdk

* WhatsApp updates to ex37

* use the manifest to pull string values

Author: AaronWDS

pom.xml

@@ -30,7 +30,7 @@
         <rooms.version>1.4.3</rooms.version>
         <click.version> 1.4.0</click.version>
         <monitor.version>1.3.0</monitor.version>
-        <admin.version>1.2.0</admin.version>
+        <admin.version>1.3.0</admin.version>
         <swagger-core-version>2.2.8</swagger-core-version>
         <jackson-version>2.14.2</jackson-version>
         <jersey2.version>3.0.9</jersey2.version>

src/main/java/com/docusign/common/WorkArguments.java

@@ -52,6 +52,7 @@ public class WorkArguments {
     private UUID formGroupId;
     private String startDate;
     private String endDate;
+    private String deliveryMethod;
     private String ccPhoneNumber;
     private String countryCode;
     private String ccCountryCode;

src/main/java/com/docusign/controller/eSignature/examples/EG037ControllerSMSDelivery.java

@@ -56,6 +56,7 @@ protected Object doWork(WorkArguments args, ModelMap model,
                 args.getCountryCode(),
                 args.getPhoneNumber(),
                 args.getSignerName(),
+                args.getDeliveryMethod(),
                 args.getCcCountryCode(),
                 args.getCcPhoneNumber(),
                 args.getCcName(),

src/main/java/com/docusign/controller/eSignature/examples/EG038ControllerResponsiveSigning.java

@@ -74,9 +74,12 @@ protected Object doWork(WorkArguments args, ModelMap model,
 
 
 	   } catch (ApiException apiException) {
+		System.out.println(apiException.getMessage());
 		  DoneExample.createDefault(this.title)
-				.withMessage(FEATURE_WAS_DISABLED)
+				.withMessage("Feature Not Enabled")
+				.withFixingInstructions(FEATURE_WAS_DISABLED)
 				.addToModel(model, config);
+			return ERROR_PAGE;
 	   }
 
 	   return new RedirectView(viewUrl.getUrl());

src/main/java/com/docusign/controller/eSignature/services/SMSDeliveryService.java

@@ -1,15 +1,12 @@
 package com.docusign.controller.eSignature.services;
 
-import com.docusign.common.WorkArguments;
 import com.docusign.controller.eSignature.examples.EnvelopeHelpers;
-import com.docusign.core.common.DocumentType;
 import com.docusign.esign.api.EnvelopesApi;
 import com.docusign.esign.client.ApiException;
 import com.docusign.esign.model.*;
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collections;
 
 public final class SMSDeliveryService {
     private static final String PDF_DOCUMENT_FILE_NAME = "World_Wide_Corp_lorem.pdf";
@@ -42,6 +39,7 @@ public static EnvelopeDefinition makeEnvelope(
             String countryCode,
             String signersPhoneNumber,
             String signerName,
+            String deliveryMethod,
             String ccCountryCode,
             String carbonCopyPhoneNumber,
             String ccName,
@@ -69,7 +67,7 @@ public static EnvelopeDefinition makeEnvelope(
         signer.setRecipientId("1");
         signer.setRoutingOrder("1");
         signer.setTabs(signerTabs);
-        signer.setDeliveryMethod("sms");
+        signer.setDeliveryMethod(deliveryMethod);
 
 
         // create a cc recipient to receive a copy of the documents, identified by name and phone number
@@ -82,7 +80,7 @@ public static EnvelopeDefinition makeEnvelope(
         cc.setPhoneNumber(ccPhoneNumber);
         cc.setRecipientId("2");
         cc.setRoutingOrder("2");
-        cc.setDeliveryMethod("sms");
+        cc.setDeliveryMethod(deliveryMethod);
 
         // The order in the docs array determines the order in the envelope
         EnvelopeDefinition envelope = new EnvelopeDefinition();

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

@@ -5,9 +5,13 @@
 <c:set var="countryCodeInputNumber" value="0" scope="page" />
 <c:set var="numberInputNumber" value="1" scope="page" />
 <c:set var="signerNameInputNumber" value="2" scope="page" />
+<c:set var="deliveryMethod" value="6" scope="page" />
 <c:set var="ccCountryCodeInputNumber" value="3" scope="page" />
 <c:set var="ccNumberInputNumber" value="4" scope="page" />
 <c:set var="ccSignerNameInputNumber" value="5" scope="page" />
+<c:set var="sms" value="7" scope="page" />
+<c:set var="whatsapp" value="8" scope="page" />
+
 
 <h4>${example.getExampleName()}</h4>
 <p>${example.getExampleDescription()}</p>
@@ -22,7 +26,11 @@
 </p>
 
 <form class="eg" action="" method="post" data-busy="form">
-
+    <div class="form-group">
+      <label for="deliveryMethod">${example.getForms().get(formNumber).getInputs().get(deliveryMethod).getInputName()}</label><br>
+      <input type="radio" checked="checked" name="deliveryMethod" id="delivery_method1" value="SMS"/> ${example.getForms().get(formNumber).getInputs().get(sms).getInputName()} &nbsp;
+      <input type="radio" name="deliveryMethod" id="delivery_method2" value="WhatsApp"/> ${example.getForms().get(formNumber).getInputs().get(whatsapp).getInputName()} <br>
+    </div> 
     <div class="form-group">
         <label for="countryCode">
             ${example.getForms().get(formNumber).getInputs().get(countryCodeInputNumber).getInputName()}