inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Batch changes from of review comments - there are more

Browse Source
This commit is contained in:
alandavis
2022-09-07 15:12:19 +01:00
parent 1abbae8e5b
commit 6e85b860e9
13 changed files with 81 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engines/base/README.md
View File

@@ -35,7 +35,8 @@ implementations.
The `TransformEngineName` is important if the config from multiple T-Engines is being
combined as they are sorted by name.
```
```java
package org.alfresco.transform.example;
import com.google.common.collect.ImmutableMap;
@@ -81,7 +82,8 @@ public class HelloTransformEngine implements TransformEngine
```
**Example CustomTransformer**
```
```java
package org.alfresco.transform.example;
import org.alfresco.transform.base.CustomTransformer;
@@ -120,6 +122,7 @@ public class HelloTransformer implements CustomTransformer
```
**Example T-Config** `resources/hello_engine_config.json`
```json
{
"transformOptions": {
@@ -145,12 +148,14 @@ public class HelloTransformer implements CustomTransformer
**Example properties** `resources/application-default.yaml`
As can be seen the following defines a default which can be overridden by an environment variable.
```yaml
queue:
engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.libreoffice.acs}
```
**Example ProbeTransform test file** `resources/probe.txt`
```json
```text
Jane
```

2
engines/base/src/main/java/org/alfresco/transform/base/Application.java
View File

@@ -46,8 +46,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableRetry
public class Application
{
private static final Logger logger = LoggerFactory.getLogger(Application.class);
@Value("${container.name}")
private String containerName;

34
engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
View File

@@ -97,13 +97,19 @@ import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
@Controller
public class TransformController
{
private static final Logger logger = LoggerFactory.getLogger(TransformController.class);
private static final String MODEL_TITLE = "title";
private static final String MODEL_PROXY_PATH_PREFIX = "proxyPathPrefix";
private static final String MODEL_MESSAGE = "message";
@Autowired(required = false)
private List<TransformEngine> transformEngines;
@Autowired
private TransformServiceRegistry transformRegistry;
@Autowired TransformHandler transformHandler;
@Autowired
TransformHandler transformHandler;
@Autowired
private String coreVersion;
@Autowired
@@ -119,11 +125,11 @@ public class TransformController
if (transformEngines != null)
{
transformEngine = getTransformEngine();
logger.info("TransformEngine: " + transformEngine.getTransformEngineName());
logger.info("TransformEngine: {}", transformEngine.getTransformEngineName());
transformEngines.stream()
.filter(te -> te != transformEngine)
.filter(transformEngineFromStream -> transformEngineFromStream != transformEngine)
.sorted(Comparator.comparing(TransformEngine::getTransformEngineName))
.map(transformEngine -> " "+transformEngine.getTransformEngineName()).forEach(logger::info);
.map(sortedTransformEngine -> " "+sortedTransformEngine.getTransformEngineName()).forEach(logger::info);
}
}
@@ -133,7 +139,7 @@ public class TransformController
// CustomTransform code from many t-engines into a single t-engine. In this case, there should be a wrapper
// TransformEngine (it has no TransformConfig of its own).
return transformEngines.stream()
.filter(transformEngine -> transformEngine.getTransformConfig() == null)
.filter(transformEngineFromStream -> transformEngineFromStream.getTransformConfig() == null)
.findFirst()
.orElse(transformEngines.get(0));
}
@@ -171,8 +177,8 @@ public class TransformController
@GetMapping(ENDPOINT_ROOT)
public String test(Model model)
{
model.addAttribute("title", getSimpleTransformEngineName() + " Test Page");
model.addAttribute("proxyPathPrefix", getPathPrefix());
model.addAttribute(MODEL_TITLE, getSimpleTransformEngineName() + " Test Page");
model.addAttribute(MODEL_PROXY_PATH_PREFIX, getPathPrefix());
TransformConfig transformConfig = ((TransformRegistry) transformRegistry).getTransformConfig();
transformConfig = setOrClearCoreVersion(transformConfig, 0);
model.addAttribute("transformOptions", optionLister.getOptionNames(transformConfig.getTransformOptions()));
@@ -185,8 +191,8 @@ public class TransformController
@GetMapping(ENDPOINT_ERROR)
public String error(Model model)
{
model.addAttribute("title", getSimpleTransformEngineName() + " Error Page");
model.addAttribute("proxyPathPrefix", getPathPrefix());
model.addAttribute(MODEL_TITLE, getSimpleTransformEngineName() + " Error Page");
model.addAttribute(MODEL_PROXY_PATH_PREFIX, getPathPrefix());
return "error"; // display error.html
}
@@ -196,8 +202,8 @@ public class TransformController
@GetMapping(ENDPOINT_LOG)
String log(Model model)
{
model.addAttribute("title", getSimpleTransformEngineName() + " Log Entries");
model.addAttribute("proxyPathPrefix", getPathPrefix());
model.addAttribute(MODEL_TITLE, getSimpleTransformEngineName() + " Log Entries");
model.addAttribute(MODEL_PROXY_PATH_PREFIX, getPathPrefix());
Collection<LogEntry> log = LogEntry.getLog();
if (!log.isEmpty())
{
@@ -342,9 +348,9 @@ public class TransformController
response.sendError(e.getStatus().value(), message);
ModelAndView mav = new ModelAndView();
mav.addObject("title", getSimpleTransformEngineName() + " Error Page");
mav.addObject("proxyPathPrefix", getPathPrefix());
mav.addObject("message", message);
mav.addObject(MODEL_TITLE, getSimpleTransformEngineName() + " Error Page");
mav.addObject(MODEL_PROXY_PATH_PREFIX, getPathPrefix());
mav.addObject(MODEL_MESSAGE, message);
mav.setViewName("error"); // display error.html
return mav;
}

2
engines/base/src/main/java/org/alfresco/transform/base/fs/FileManager.java
View File

@@ -221,7 +221,7 @@ public class FileManager
final File systemTempDir = new File(systemTempDirPath);
final File tempDir = new File(systemTempDir, dirName);
if (!tempDir.exists() && !tempDir.mkdirs() && !tempDir.exists())
if (!tempDir.exists() && !tempDir.mkdirs())
{
throw new RuntimeException("Failed to create temp directory: " + tempDir);
}

7
engines/base/src/main/resources/templates/error.html
View File

@@ -1,4 +1,9 @@
<html xmlns:th="http://www.thymeleaf.org">
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xml:lang="en">
<head>
<title th:text="${title}"/>
</head>
<body>
<div>

7
engines/base/src/main/resources/templates/log.html
View File

@@ -1,4 +1,9 @@
<html xmlns:th="http://www.thymeleaf.org">
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xml:lang="en">
<head>
<title th:text="${title}"/>
</head>
<body>
<div>

7
engines/base/src/main/resources/templates/test.html
View File

@@ -1,4 +1,9 @@
<html xmlns:th="http://www.thymeleaf.org">
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xml:lang="en">
<head>
<title th:text="${title}"/>
</head>
<body>
<div>
<h2 th:text="${title}"></h2>