Merge pull request #153 from docusign/fixes-for-java-examples

Fixes for file paths and monitor example

Author: InbarGazit

src/main/java/com/docusign/controller/click/examples/ClickwrapHelper.java

@@ -22,8 +22,8 @@ public class ClickwrapHelper {
      * @return the {@link Document} object
      * @throws IOException if document cannot be loaded due to some reason
      */
-    public static Document createDocumentFromFile(String fileName, String docName, Integer order) throws IOException {
-        byte[] buffer = FileUtils.readFile(fileName);
+    public Document createDocumentFromFile(String fileName, String docName, Integer order) throws IOException {
+        byte[] buffer = new FileUtils().readFile(fileName);
         String extension = FilenameUtils.getExtension(fileName);
         return createDocument(buffer, docName, extension, order);
     }

src/main/java/com/docusign/controller/click/services/CreateClickwrapService.java

@@ -18,7 +18,7 @@ public static ClickwrapRequest createClickwrapRequest(
             String documentName,
             Integer documentOrder
     ) throws IOException {
-        Document document = ClickwrapHelper.createDocumentFromFile(fileName, documentName, documentOrder);
+        Document document = new ClickwrapHelper().createDocumentFromFile(fileName, documentName, documentOrder);
         DisplaySettings displaySettings = new DisplaySettings()
                 .displayName("Terms of Service")
                 .consentButtonText("I Agree")

src/main/java/com/docusign/controller/click/services/CreateNewVersionClickwrapService.java

@@ -33,7 +33,7 @@ public static ClickwrapRequest createClickwrapRequest(
             Integer documentOrder,
             String clickwrapName
     ) throws IOException {
-        Document document = ClickwrapHelper.createDocumentFromFile(fileName, documentName, documentOrder);
+        Document document = new ClickwrapHelper().createDocumentFromFile(fileName, documentName, documentOrder);
         DisplaySettings displaySettings = new DisplaySettings()
                 .displayName(clickwrapName)
                 .consentButtonText("I Agree")

src/main/java/com/docusign/controller/monitor/services/GetMonitoringDataService.java

@@ -15,7 +15,7 @@ public final class GetMonitoringDataService {
     public static JSONArray getMonitoringData(DataSetApi datasetApi) throws Exception {
         // Declare variables
         boolean complete = false;
-        LocalDate cursorDate = LocalDate.now().minusYears(1);
+        LocalDate cursorDate = LocalDate.now().minusDays(1);
         String cursorValue = cursorDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "T00:00:00Z";
         JSONArray monitoringData = new JSONArray();
 

src/main/java/com/docusign/core/utils/FileUtils.java

@@ -1,9 +1,10 @@
 package com.docusign.core.utils;
 
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.StreamUtils;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 
 public class FileUtils {
     /**
@@ -13,8 +14,12 @@ public class FileUtils {
      * @return the new byte array that has been loaded from the file
      * @throws IOException in case of I/O errors
      */
-    public static byte[] readFile(String path) throws IOException {
-        ClassPathResource resource = new ClassPathResource(path);
-        return StreamUtils.copyToByteArray(resource.getInputStream());
+    public byte[] readFile(String path) throws IOException {
+       InputStream inputStream = getClass().getClassLoader().getResourceAsStream(path);
+        if (inputStream == null) {
+            throw new FileNotFoundException("File not found: " + path);
+        }
+
+        return StreamUtils.copyToByteArray(inputStream);
     }
 }

src/test/java/tests/Click/CreateClickwrapTest.java

@@ -55,7 +55,7 @@ public void CreateClickwrapRequest_CorrectInputValues_ReturnsClickwrapRequest()
         String format = "modal";
         String documentDisplay = "document";
 
-        Document document = ClickwrapHelper.createDocumentFromFile(DOCUMENT_FILE_NAME, DOCUMENT_NAME, DOCUMENT_ORDER);
+        Document document = new ClickwrapHelper().createDocumentFromFile(DOCUMENT_FILE_NAME, DOCUMENT_NAME, DOCUMENT_ORDER);
         DisplaySettings displaySettings = new DisplaySettings()
                 .displayName(displayName)
                 .consentButtonText(consentButtonText)