Merge pull request #388 from ksandrasegaramz/release-1.5

CRC-5397 - Call the new Alfresco API to Provide document as PDF

Author: purple52

file/file-alfresco/src/main/java/uk/gov/justice/services/file/alfresco/requester/AlfrescoFileRequester.java

@@ -28,6 +28,10 @@ public class AlfrescoFileRequester implements FileRequester {
     @GlobalValue(key = "alfrescoWorkspacePath", defaultValue = "/service/api/node/content/workspace/SpacesStore/")
     String alfrescoWorkspacePath;
 
+    @Inject
+    @GlobalValue(key = "alfrescoPdfContentWorkspacePath", defaultValue = "/service/api/requestpdf/workspace/SpacesStore/")
+    String alfrescoPdfContentWorkspacePath;
+
     @Inject
     @GlobalValue(key = "alfrescoReadUser")
     String alfrescoReadUser;
@@ -48,8 +52,27 @@ public Optional<InputStream> request(final String fileId, final String fileMimeT
         }
     }
 
+    @Override
+    public Optional<InputStream> requestPdf(final String fileId, final String fileName) {
+        final String mimeType = "application/pdf";
+        try {
+            return ofNullable(restClient.getAsInputStream(alfrescoPdfUriOf(fileId, fileName),
+                    valueOf(mimeType), headersWithUserId(alfrescoReadUser)));
+        } catch (final NotFoundException nfe) {
+            return empty();
+        } catch (final ProcessingException | InternalServerErrorException ex) {
+            throw new FileOperationException(format("Error fetching %s from Alfresco with fileId = %s",
+                    fileName, fileId), ex);
+        }
+    }
+
     private String alfrescoUriOf(final String fileId, final String fileName) {
         return format("%s%s/content/%s", alfrescoWorkspacePath, fileId, fileName);
     }
 
+    private String alfrescoPdfUriOf(final String fileId, final String fileName) {
+        return format("%s%s/%s", alfrescoPdfContentWorkspacePath, fileId, fileName);
+
+    }
+
 }

file/file-alfresco/src/test/java/uk/gov/justice/services/file/alfresco/requester/AlfrescoFileRequesterIT.java

@@ -12,12 +12,12 @@
 import static java.util.UUID.randomUUID;
 import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
 import static org.apache.openejb.util.NetworkUtil.getNextAvailablePort;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
 import static uk.gov.justice.services.test.utils.common.reflection.ReflectionUtils.setField;
 
 import uk.gov.justice.services.file.alfresco.common.AlfrescoRestClient;
@@ -42,11 +42,14 @@ public class AlfrescoFileRequesterIT {
     private static final String UNUSED_MIME_TYPE = "text/plain";
     private static final String UNUSED_FILE_NAME = "file.txt";
     private static final String ALFRESCO_WORKSPACE_PATH = "/service/api/node/content/workspace/SpacesStore/";
+    private static final String ALFRESCO_WORKSPACE_PDF_TRANSFORMATION_PATH = "/service/api/requestpdf/workspace/SpacesStore/";
+
 
     private static int PORT = getNextAvailablePort();
 
     private static AlfrescoFileRequester fileRequester;
 
+
     @Rule
     public WireMockRule wireMock = new WireMockRule(PORT);
 
@@ -66,7 +69,6 @@ public void shouldRequestFileFromAlfrescoInAttachmentMode() throws Exception {
                 .withHeader("cppuid", equalTo("user1234")));
     }
 
-
     @Test
     public void shouldReturnResponseFromAlfresco() throws IOException {
         final String fileId = randomUUID().toString();
@@ -86,6 +88,24 @@ public void shouldReturnResponseFromAlfresco() throws IOException {
 
     }
 
+    @Test
+    public void shouldReturnPdfContentFromAlfresco() throws IOException {
+        final String fileId = randomUUID().toString();
+        final String mimeType = "application/pdf";
+        final String fileName = "file123.txt";
+        final String fileContent = "abcd";
+
+        stubFor(get(urlMatching(format("/alfresco%s%s/%s", ALFRESCO_WORKSPACE_PDF_TRANSFORMATION_PATH, fileId, fileName)))
+                .withHeader("cppuid", equalTo("user1234"))
+                .willReturn(aResponse().withHeader("Content-Type", mimeType).withBody(fileContent)));
+
+        final Optional<InputStream> inputStream = fileRequester.requestPdf(fileId, fileName);
+        assertTrue(inputStream.isPresent());
+
+        assertThat(IOUtils.toString(inputStream.get()), is(fileContent));
+    }
+
+
     @Test
     public void shouldReturnOptionalEmptyFromAlfrescoIfFileIsNotFound() {
         final String fileId = randomUUID().toString();
@@ -98,7 +118,6 @@ public void shouldReturnOptionalEmptyFromAlfrescoIfFileIsNotFound() {
         assertFalse(fileRequester.request(fileId, mimeType, fileName).isPresent());
     }
 
-
     @Test
     public void shouldThrowAnExceptionIfAlfrescoServiceReturnedError() {
         final String fileId = randomUUID().toString();
@@ -115,7 +134,6 @@ public void shouldThrowAnExceptionIfAlfrescoServiceReturnedError() {
         }
     }
 
-
     @Test
     public void shouldThrowAnExceptionIfAlfrescoServiceIsUnavailable() {
         final String fileId = randomUUID().toString();
@@ -131,6 +149,7 @@ public void shouldThrowAnExceptionIfAlfrescoServiceIsUnavailable() {
     private static AlfrescoFileRequester alfrescoFileRequesterWith(final String basePath) {
         AlfrescoFileRequester fileRequester = new AlfrescoFileRequester();
         fileRequester.alfrescoWorkspacePath = ALFRESCO_WORKSPACE_PATH;
+        fileRequester.alfrescoPdfContentWorkspacePath = ALFRESCO_WORKSPACE_PDF_TRANSFORMATION_PATH;
         fileRequester.alfrescoReadUser = "user1234";
         fileRequester.restClient = new AlfrescoRestClient();
         setField(fileRequester.restClient, "alfrescoBaseUri", basePath);

file/file-api/src/main/java/uk/gov/justice/services/file/api/requester/FileRequester.java

@@ -10,12 +10,22 @@ public interface FileRequester {
 
     /**
      * Requests a file from the FileService.
-     * @param fileId - the unique id of the file.
+     *
+     * @param fileId       - the unique id of the file.
      * @param fileMimeType - mime-type of the file.
-     * @param fileName - name of the file.
+     * @param fileName     - name of the file.
      * @return streamed content of the file.
      */
     Optional<InputStream> request(final String fileId, final String fileMimeType, final String fileName);
 
+    /**
+     * Requests for stream the pdf transformation of the file that given by its fileId from the FileService.
+     *
+     * @param fileId   - the unique id of the file.
+     * @param fileName - name of the file.
+     * @return streamed content of the file.
+     */
+    Optional<InputStream> requestPdf(final String fileId, final String fileName);
+
 }