From 6fc618a31c22370f7517def08b4c12fdb8690710 Mon Sep 17 00:00:00 2001 From: alandavis Date: Tue, 13 Sep 2022 15:42:19 +0100 Subject: [PATCH] Errors about single step transformer being defined in a T-Engine were not being issued, because the baseUrl was set to "---" in the router. --- .../transform/base/registry/TransformConfigFromFiles.java | 2 +- .../base/registry/TransformConfigFromTransformEngines.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java b/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java index 742a6773..46456e15 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromFiles.java @@ -70,7 +70,7 @@ public class TransformConfigFromFiles { String filename = resource.getFilename(); transformConfigSources.add( - new AbstractTransformConfigSource(filename, filename,(isTRouter ? "---" : null)) + new AbstractTransformConfigSource(filename, filename, isTRouter ? null : "---") { @Override public TransformConfig getTransformConfig() { diff --git a/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromTransformEngines.java b/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromTransformEngines.java index 3e487ad3..06ef845e 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromTransformEngines.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/registry/TransformConfigFromTransformEngines.java @@ -29,6 +29,7 @@ package org.alfresco.transform.base.registry; import org.alfresco.transform.base.TransformEngine; import org.alfresco.transform.config.TransformConfig; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @@ -44,6 +45,8 @@ public class TransformConfigFromTransformEngines private List transformEngines; @Autowired private List transformConfigSources; + @Value("${container.isTRouter}") + private boolean isTRouter; @PostConstruct public void initTransformEngineConfig() @@ -57,7 +60,7 @@ public class TransformConfigFromTransformEngines { String engineName = transformEngine.getTransformEngineName(); transformConfigSources.add( - new AbstractTransformConfigSource(engineName, engineName,null) + new AbstractTransformConfigSource(engineName, engineName, isTRouter ? null : "---") { @Override public TransformConfig getTransformConfig() {