Merge branch 'master' into maestro-code-examples

# Conflicts:
#	src/main/java/com/docusign/controller/maestro/services/CancelWorkflowInstanceService.java

Author: annahileta

src/main/java/com/docusign/controller/maestro/examples/AbstractMaestroController.java

@@ -27,11 +27,13 @@ public AbstractMaestroController(DSConfiguration config, String exampleName, Use
         this.session = session;
     }
 
+    //ds-snippet-start:MaestroJavaStep2
     protected IamClient createAuthenticatedClient(String accessToken) {
         return IamClient.builder()
                 .accessToken(accessToken)
                 .build();
     }
+    //ds-snippet-end:MaestroJavaStep2
 
     protected String serializeObjectToJson(Object data) throws Exception {
         ObjectMapper mapper = new ObjectMapper();

src/main/java/com/docusign/controller/maestro/services/CancelWorkflowInstanceService.java

@@ -4,6 +4,7 @@
 import com.docusign.iam.sdk.models.operations.*;
 
 public class CancelWorkflowInstanceService {
+    //ds-snippet-start:Maestro4Step3
     public static CancelWorkflowInstanceResponse CancelMaestroWorkflowInstance(
             IamClient client,
             String accountId,
@@ -12,6 +13,7 @@ public static CancelWorkflowInstanceResponse CancelMaestroWorkflowInstance(
         return client.maestro().workflowInstanceManagement()
                 .cancelWorkflowInstance(accountId, workflowId, instanceId);
     }
+    //ds-snippet-end:Maestro4Step3
 
     public static GetWorkflowInstanceResponse GetWorkflowInstanceStatus(
             IamClient client,

src/main/java/com/docusign/controller/maestro/services/PauseWorkflowService.java

@@ -4,11 +4,13 @@
 import com.docusign.iam.sdk.models.operations.*;
 
 public class PauseWorkflowService {
+    //ds-snippet-start:Maestro2Step3
     public static PauseNewWorkflowInstancesResponse PauseMaestroWorkflow(
             IamClient client,
             String accountId,
             String workflowId) throws Exception {
         return client.maestro()
                 .workflows().pauseNewWorkflowInstances(accountId, workflowId);
     }
+    //ds-snippet-end:Maestro2Step3
 }

src/main/java/com/docusign/controller/maestro/services/ResumeWorkflowService.java

@@ -4,11 +4,13 @@
 import com.docusign.iam.sdk.models.operations.*;
 
 public class ResumeWorkflowService {
+    //ds-snippet-start:Maestro3Step3
     public static ResumePausedWorkflowResponse ResumeMaestroWorkflow(
             IamClient client,
             String accountId,
             String workflowId) throws Exception {
         return client.maestro()
                 .workflows().resumePausedWorkflow(accountId, workflowId);
     }
+    //ds-snippet-end:Maestro3Step3
 }

src/main/java/com/docusign/controller/maestro/services/TriggerWorkflowService.java

@@ -132,24 +132,30 @@ public static TriggerWorkflowResponse triggerWorkflowInstance(
             String ccEmail,
             String ccName,
             String instanceName) throws Exception {
+    //ds-snippet-start:Maestro1Step4
         Map<String, TriggerInputs> triggerInputs = new HashMap<>();
         triggerInputs.put("signerName", createTriggerInput(signerName));
         triggerInputs.put("signerEmail", createTriggerInput(signerEmail));
         triggerInputs.put("ccName", createTriggerInput(ccName));
         triggerInputs.put("ccEmail", createTriggerInput(ccEmail));
+    //ds-snippet-end:Maestro1Step4
 
-        TriggerWorkflow triggerWorkflow = new TriggerWorkflow(instanceName, triggerInputs);
+    //ds-snippet-start:Maestro1Step5
+w = new TriggerWorkflow(instanceName, triggerInputs);
 
         return client.maestro()
                 .workflows()
                 .triggerWorkflow(accountId, workflowId, triggerWorkflow);
     }
+    //ds-snippet-end:Maestro1Step5
 
+    //ds-snippet-start:Maestro1Step3
     public static GetWorkflowsListResponse getMaestroWorkflow(
             IamClient client,
             String accountId) throws Exception {
         return client.maestro()
                 .workflows()
                 .getWorkflowsList(accountId, Optional.of(Status.ACTIVE), Optional.empty());
     }
+    //ds-snippet-end:Maestro1Step3
 }

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

@@ -5,8 +5,14 @@
 <p>${example.getResultsPageText()}</p>
 
 
+<!--
+//ds-snippet-start:Maestro1Step6
+-->
 <iframe width="900" height="600" src="${url}">
 </iframe>
+<!--
+//ds-snippet-end:Maestro1Step6
+-->
 
 <p><a href="/">${launcherTexts.getContinueButton()}</a></p>