From 664d2b84b2f720c0db4dcd3fffea0149417b31ee Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@hyland.com>
Date: Tue, 9 Aug 2022 08:59:09 +0100
Subject: [PATCH] [release] 3.0.0-HXP-A2

* Fix ready probe in libreoffice & imagemagick
* Add switch for behind-proxy
---
 .../transform/base/TransformController.java    | 18 +++++++++++++-----
 .../base/src/main/resources/application.yaml   |  1 +
 .../base/src/main/resources/templates/log.html |  2 +-
 .../ImageMagickTransformEngine.java            |  2 +-
 .../LibreOfficeTransformEngine.java            |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
index 3979ae96..b408efdd 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
@@ -37,6 +37,7 @@ import org.alfresco.transform.registry.TransformServiceRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.io.Resource;
@@ -104,6 +105,8 @@ public class TransformController
     private String coreVersion;
     @Autowired
     private OptionLister optionLister;
+    @Value("${container.behind-ingres}")
+    private boolean behindIngres;
 
     TransformEngine transformEngine;
 
@@ -181,14 +184,19 @@ public class TransformController
         return "log"; // display log.html
     }
 
-    private static Object getPathPrefix(String transformEngineName)
+    private Object getPathPrefix(String transformEngineName)
     {
-        int i = transformEngineName.lastIndexOf('-');
-        if (i != -1)
+        String pathPrefix = "";
+        if (behindIngres)
         {
-            transformEngineName = transformEngineName.substring(i+1);
+            int i = transformEngineName.lastIndexOf('-');
+            if (i != -1)
+            {
+                transformEngineName = transformEngineName.substring(i + 1);
+            }
+            pathPrefix = "/" + transformEngineName.toLowerCase();
         }
-        return "/"+transformEngineName.toLowerCase();
+        return pathPrefix;
     }
 
     /**
diff --git a/engines/base/src/main/resources/application.yaml b/engines/base/src/main/resources/application.yaml
index 8f6032c6..c253d7aa 100644
--- a/engines/base/src/main/resources/application.yaml
+++ b/engines/base/src/main/resources/application.yaml
@@ -53,6 +53,7 @@ management:
 
 container:
   name: ${HOSTNAME:t-engine}
+  behind-ingres: true
 
 async-task-executor:
   core-pool-size: 1
diff --git a/engines/base/src/main/resources/templates/log.html b/engines/base/src/main/resources/templates/log.html
index 0aa86a5b..b23870a6 100644
--- a/engines/base/src/main/resources/templates/log.html
+++ b/engines/base/src/main/resources/templates/log.html
@@ -36,7 +36,7 @@
     <div>
         <br/>
         <a th:href="${proxyPathPrefix+'/'}">Test</a>
-        <a th:href="${proxyPathPrefix+'/log'}">Log</a>
+        Log
         <a th:href="${proxyPathPrefix+'/ready'}">Ready</a>
         <a th:href="${proxyPathPrefix+'/live'}">Live</a>
         <a th:href="${proxyPathPrefix+'/transform/config?configVersion=9999'}">Config</a>
diff --git a/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java
index 6d844090..3517e448 100644
--- a/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java
+++ b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java
@@ -69,6 +69,6 @@ public class ImageMagickTransformEngine implements TransformEngine
     public ProbeTransform getProbeTransform()
     {
         return new ProbeTransform("probe.jpg", MIMETYPE_IMAGE_JPEG, MIMETYPE_IMAGE_PNG, Collections.emptyMap(),
-                35593, 1024, 150, 1024, 60 * 15 + 1, 60 * 15);
+            25383, 1024, 150, 1024, 60 * 15 + 1, 60 * 15);
     }
 }
diff --git a/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java
index 2f7979c6..e139932b 100644
--- a/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java
+++ b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java
@@ -69,7 +69,7 @@ public class LibreOfficeTransformEngine implements TransformEngine
     @Override
     public ProbeTransform getProbeTransform()
     {
-        return new ProbeTransform("probe.jpg", MIMETYPE_WORD, MIMETYPE_PDF, Collections.emptyMap(),
+        return new ProbeTransform("probe.doc", MIMETYPE_WORD, MIMETYPE_PDF, Collections.emptyMap(),
                 11817, 1024, 150, 10240, 60 * 30 + 1, 60 * 15 + 20);
     }
 }