From f831c466720fdfdcca78f77aac5eb237cb27f00c Mon Sep 17 00:00:00 2001
From: David Edwards <david.edwards@alfresco.com>
Date: Fri, 11 Jun 2021 21:07:11 +0100
Subject: [PATCH] Refactor Tika Controller (#415)

Allows for object creation to be done on instatiation, instead of first transform call.
---
 .../alfresco/transformer/TikaController.java  | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 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 d6d39b36..05631956 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
@@ -68,11 +68,13 @@ public class TikaController extends AbstractTransformerController
 {
     private static final Logger logger = LoggerFactory.getLogger(TikaController.class);
 
-    @Value("${transform.core.tika.pdfBox.notExtractBookmarksTextDefault:false}")
-    private boolean notExtractBookmarksTextDefault;
-
     private TikaJavaExecutor javaExecutor;
 
+    public TikaController(@Value("${transform.core.tika.pdfBox.notExtractBookmarksTextDefault:false}") boolean notExtractBookmarksTextDefault)
+    {
+        javaExecutor= new TikaJavaExecutor(notExtractBookmarksTextDefault);
+    }
+
     @Override
     public String getTransformerName()
     {
@@ -106,15 +108,6 @@ public class TikaController extends AbstractTransformerController
                                  Map<String, String> transformOptions, File sourceFile, File targetFile)
     {
         transformOptions.put(TRANSFORM_NAME_PARAMETER, transformName);
-        getJavaExecutor().transform(sourceMimetype, targetMimetype, transformOptions, sourceFile, targetFile);
-    }
-
-    private TikaJavaExecutor getJavaExecutor()
-    {
-        if(javaExecutor==null)
-        {
-            javaExecutor = new TikaJavaExecutor(notExtractBookmarksTextDefault);
-        }
-        return javaExecutor;
+        javaExecutor.transform(sourceMimetype, targetMimetype, transformOptions, sourceFile, targetFile);
     }
 }