From 74680fbe58f269906f906fa9f18fcf5c6fd90454 Mon Sep 17 00:00:00 2001
From: David Edwards <david.edwards@alfresco.com>
Date: Tue, 15 Jun 2021 16:39:28 +0100
Subject: [PATCH] ACS-1677 Provide file extension from JMS request if missing
 in SFS (#428)

---
 .../transformer/AbstractTransformerController.java         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
index 70a6e05d..602d616e 100644
--- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
+++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
@@ -230,7 +230,7 @@ public abstract class AbstractTransformerController implements TransformControll
         File sourceFile;
         try
         {
-            sourceFile = loadSourceFile(request.getSourceReference());
+            sourceFile = loadSourceFile(request.getSourceReference(), request.getSourceExtension());
         }
         catch (TransformException e)
         {
@@ -358,9 +358,10 @@ public abstract class AbstractTransformerController implements TransformControll
      * Loads the file with the specified sourceReference from Alfresco Shared File Store
      *
      * @param sourceReference reference to the file in Alfresco Shared File Store
+     * @param sourceExtension default extension if the file in Alfresco Shared File Store has none
      * @return the file containing the source content for the transformation
      */
-    private File loadSourceFile(final String sourceReference)
+    private File loadSourceFile(final String sourceReference, final String sourceExtension)
     {
         ResponseEntity<Resource> responseEntity = alfrescoSharedFileStoreClient
             .retrieveFile(sourceReference);
@@ -369,7 +370,7 @@ public abstract class AbstractTransformerController implements TransformControll
         HttpHeaders headers = responseEntity.getHeaders();
         String filename = getFilenameFromContentDisposition(headers);
 
-        String extension = getFilenameExtension(filename);
+        String extension = getFilenameExtension(filename) != null ? getFilenameExtension(filename) : sourceExtension;
         MediaType contentType = headers.getContentType();
         long size = headers.getContentLength();