From 522c79397067fd4a468f9fd62ea6254e3e5c55be Mon Sep 17 00:00:00 2001
From: eknizat <26163420+eknizat@users.noreply.github.com>
Date: Tue, 23 Jun 2020 16:52:49 +0100
Subject: [PATCH] ACS-373: Fix tika proble UnsupportedOperationException (#264)

---
 .../org/alfresco/transformer/TikaController.java  |  4 ++--
 .../alfresco/transformer/TikaControllerTest.java  | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java
index 618e4723..82323940 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 
 import java.io.File;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.alfresco.transformer.executors.Tika.PDF_BOX;
@@ -92,7 +92,7 @@ public class TikaController extends AbstractTransformerController
             @Override
             protected void executeTransformCommand(File sourceFile, File targetFile)
             {
-                transformImpl(PDF_BOX, MIMETYPE_PDF, MIMETYPE_TEXT_PLAIN, Collections.emptyMap(), sourceFile, targetFile);
+                transformImpl(PDF_BOX, MIMETYPE_PDF, MIMETYPE_TEXT_PLAIN, new HashMap<>(), sourceFile, targetFile);
             }
         };
     }
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java
index ec337fc1..be636556 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java
@@ -31,6 +31,7 @@ import org.alfresco.transform.client.model.TransformRequest;
 import org.alfresco.transformer.executors.RuntimeExec;
 import org.alfresco.transformer.model.FileRefEntity;
 import org.alfresco.transformer.model.FileRefResponse;
+import org.alfresco.transformer.probes.ProbeTestTransform;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,10 +45,12 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
@@ -269,6 +272,18 @@ public class TikaControllerTest extends AbstractTransformerControllerTest
                     .param("sourceMimetype", sourceMimetype);
     }
 
+    @Mock
+    HttpServletRequest httpServletRequest;
+
+    @Test
+    public void testImmutableEmptyMap()
+    {
+        // See ACS-373
+        ProbeTestTransform probeTestTransform = getController().getProbeTestTransform();
+        ReflectionTestUtils.setField(probeTestTransform, "livenessTransformEnabled", true);
+        probeTestTransform.doTransformOrNothing(httpServletRequest, true);
+    }
+
     @Test
     @Override
     public void simpleTransformTest() throws Exception