aligning flow with the C# example

Author: annahileta

src/main/java/com/docusign/controller/navigator/examples/Nav003BulkUploadDocumentsController.java

@@ -77,10 +77,12 @@ public String postCompleteUpload(WorkArguments args, ModelMap model) throws Exce
         var accountId = session.getAccountId();
         var accessToken = user.getAccessToken();
 
-        NavigatorMethodsService.completeBulkUploadJob(accountId, accessToken, jobId);
+        var completeUploadResult = NavigatorMethodsService.completeBulkUploadJob(accountId, accessToken, jobId);
 
+        var jsonAgreement = NavigatorMethodsService.serializeObjectToJson(completeUploadResult.bulkJob().orElseThrow());
         DoneExample.createDefault(getTextForCodeExampleByApiType().ExampleName)
                 .withMessage(getTextForCodeExampleByApiType().AdditionalPage.get(1).ResultsPageText)
+                .withJsonObject(jsonAgreement)
                 .addToModel(model, config);
 
         return DONE_EXAMPLE_PAGE;

src/main/java/com/docusign/controller/navigator/services/NavigatorMethodsService.java

@@ -9,6 +9,8 @@
 import com.docusign.iam.sdk.models.operations.UploadCompleteBulkJobResponse;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.openapitools.jackson.nullable.JsonNullableModule;
 
@@ -54,7 +56,9 @@ public static GetAgreementResponse getAgreement(String accountId, String accessT
 	public static String serializeObjectToJson(Object data) throws Exception {
 		var mapper = new ObjectMapper()
 			.setSerializationInclusion(JsonInclude.Include.NON_NULL)
+			.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
 			.registerModule(new JavaTimeModule())
+			.registerModule(new Jdk8Module())
 			.registerModule(new JsonNullableModule());
 
 		return mapper.writeValueAsString(data);
@@ -110,11 +114,11 @@ public static void uploadDocumentsToJob(List<String> uploadUrls) throws Exceptio
 				continue;
 
 			var docInfo = demoDocs.get(i);
-			var bytes = loadClasspathResource(docInfo[0]);
+			var bytes = loadClasspathResource(docInfo);
 			if (bytes == null)
 				continue;
 
-			uploadToBlobStorage(bytes, docInfo[1], docInfo[2], uploadUrl);
+			uploadToBlobStorage(bytes, getContentType(docInfo), docInfo, uploadUrl);
 		}
 	}
 
@@ -127,26 +131,49 @@ public static UploadCompleteBulkJobResponse completeBulkUploadJob(
 			.uploadCompleteBulkJob(accountId, jobId);
 	}
 
-	private static List<String[]> getAvailableDemoDocuments() {
-		String[][] candidates = {
-			{ "World_Wide_Corp_Battle_Plan_Trafalgar.docx",
-				"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-				"World_Wide_Corp_Battle_Plan_Trafalgar.docx" },
-			{ "World_Wide_Corp_lorem.pdf", "application/pdf", "World_Wide_Corp_lorem.pdf" },
-			{ "doc_1.html", "text/html", "doc_1.html" },
-			{ "Welcome.txt", "text/plain", "Welcome.txt" },
-			{ "Id.jpg", "image/jpeg", "Id.jpg" },
+	private static List<String> getAvailableDemoDocuments() {
+		String[] candidates = {
+			"World_Wide_Corp_Battle_Plan_Trafalgar.docx",
+			"World_Wide_Corp_lorem.pdf",
+			"doc_1.html",
+			"Welcome.txt",
+			"Id.jpg",
 		};
 
-		var available = new ArrayList<String[]>();
+		var available = new ArrayList<String>();
 		for (var doc : candidates) {
-			if (NavigatorMethodsService.class.getClassLoader().getResource(doc[0]) != null) {
+			if (NavigatorMethodsService.class.getClassLoader().getResource(doc) != null) {
 				available.add(doc);
 			}
 		}
 		return available;
 	}
 
+	private static String getContentType(String filename) {
+		String extension = "";
+		int lastDot = filename.lastIndexOf('.');
+
+		if (lastDot >= 0) {
+			extension = filename.substring(lastDot).toLowerCase();
+		}
+
+		switch (extension) {
+			case ".docx":
+				return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+			case ".pdf":
+				return "application/pdf";
+			case ".html":
+				return "text/html";
+			case ".txt":
+				return "text/plain";
+			case ".jpg":
+			case ".jpeg":
+				return "image/jpeg";
+			default:
+				return "application/octet-stream";
+		}
+	}
+
 	private static byte[] loadClasspathResource(String resourcePath) {
 		try (var stream = NavigatorMethodsService.class.getClassLoader().getResourceAsStream(resourcePath)) {
 			if (stream == null)

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

@@ -5,15 +5,6 @@
 
     <h4>${example.getExampleName()}</h4>
     <p>${example.getAdditionalPage().get(0).getResultsPageText()}</p>
-    <c:if test="${showDoc}">
-        <p><a target='_blank' href='${documentation}'>Documentation</a> about this example.</p>
-    </c:if>
-
-    <jsp:include page="../../links_to_api_methods.jsp" />
-
-    <p>
-        ${viewSourceFile}
-    </p>
 
     <form class="eg" action="" method="post" data-busy="form">
         <input type="hidden" name="_csrf" value="${csrfToken}">

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

@@ -5,16 +5,7 @@
 
     <h4>${example.getExampleName()}</h4>
     <p>${example.getResultsPageText()}</p>
-    <c:if test="${showDoc}">
-        <p><a target='_blank' href='${documentation}'>Documentation</a> about this example.</p>
-    </c:if>
-
-    <jsp:include page="../../links_to_api_methods.jsp" />
-
-    <p>
-        ${viewSourceFile}
-    </p>
-
+    
     <form class="eg" action="" method="post" data-busy="form">
         <input type="hidden" name="_csrf" value="${csrfToken}">
         <button type="submit" class="btn btn-docu">${launcherTexts.getContinueButton()}</button>