mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-08-07 17:48:35 +00:00
Fix formatting and rename the module as per review comments
This commit is contained in:
@@ -3,8 +3,8 @@
|
|||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>alfresco-transform-aio</artifactId>
|
<artifactId>alfresco-transform-core-aio</artifactId>
|
||||||
<name>Alfresco All In One Transformer</name>
|
<name>Alfresco Core All-In-One Transformer</name>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
@@ -54,10 +54,15 @@ public abstract class AbstractTransformer implements Transformer
|
|||||||
this.jsonObjectMapper = objectMapper;
|
this.jsonObjectMapper = objectMapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setTransformConfig(TransformConfig transformConfig)
|
||||||
|
{
|
||||||
|
this.transformConfig = transformConfig;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to search for a engine configuration file.
|
* Used to search for an engine configuration file.
|
||||||
*
|
*
|
||||||
* @return A unique prefix which is used to load an <prefix> _engine_config.json
|
* @return A unique prefix which is used to load a <prefix> _engine_config.json file
|
||||||
*/
|
*/
|
||||||
abstract String getTransformerConfigPrefix();
|
abstract String getTransformerConfigPrefix();
|
||||||
|
|
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -61,9 +62,10 @@ public class AllInOneTransformer implements Transformer
|
|||||||
{
|
{
|
||||||
this.registerTransformer(new MiscAdapter());
|
this.registerTransformer(new MiscAdapter());
|
||||||
this.registerTransformer(new TikaAdapter());
|
this.registerTransformer(new TikaAdapter());
|
||||||
} catch (Exception e)
|
}
|
||||||
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
// rethrow as runtime exception, nothing else cane be done
|
// Rethrow as runtime exception, nothing else can be done
|
||||||
throw new RuntimeException("Failed to register all transformers.", e);
|
throw new RuntimeException("Failed to register all transformers.", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -87,7 +89,7 @@ public class AllInOneTransformer implements Transformer
|
|||||||
}
|
}
|
||||||
|
|
||||||
transformerTransformMapping.put(transformerName, transformer);
|
transformerTransformMapping.put(transformerName, transformer);
|
||||||
logger.debug("Registered transformer with name: '" + transformerName + "' ");
|
logger.debug("Registered transformer with name: '{}'.", transformerName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,7 +100,7 @@ public class AllInOneTransformer implements Transformer
|
|||||||
String transformName = transformOptions.get(TRANSFORM_NAME_PARAMETER);
|
String transformName = transformOptions.get(TRANSFORM_NAME_PARAMETER);
|
||||||
Transformer transformer = transformerTransformMapping.get(transformName);
|
Transformer transformer = transformerTransformMapping.get(transformName);
|
||||||
|
|
||||||
if(transformer == null)
|
if (transformer == null)
|
||||||
{
|
{
|
||||||
throw new Exception("No transformer mapping for : transform:" + transformName + " sourceMimetype:"
|
throw new Exception("No transformer mapping for : transform:" + transformName + " sourceMimetype:"
|
||||||
+ sourceMimetype + " targetMimetype:" + targetMimetype);
|
+ sourceMimetype + " targetMimetype:" + targetMimetype);
|
||||||
@@ -106,7 +108,7 @@ public class AllInOneTransformer implements Transformer
|
|||||||
|
|
||||||
if (logger.isDebugEnabled())
|
if (logger.isDebugEnabled())
|
||||||
{
|
{
|
||||||
logger.debug("Performing transform '" + transformName +"' using "+ transformer.getClass().getSimpleName());
|
logger.debug("Performing transform '{}' using {}", transformName, transformer.getClass().getSimpleName());
|
||||||
}
|
}
|
||||||
transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions);
|
transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions);
|
||||||
}
|
}
|
||||||
@@ -118,11 +120,13 @@ public class AllInOneTransformer implements Transformer
|
|||||||
// Merge the config for all sub transformers
|
// Merge the config for all sub transformers
|
||||||
List<org.alfresco.transform.client.model.config.Transformer> transformerConfigs = new LinkedList<>();
|
List<org.alfresco.transform.client.model.config.Transformer> transformerConfigs = new LinkedList<>();
|
||||||
Map<String, Set<TransformOption>> transformOptions = new HashMap<>();
|
Map<String, Set<TransformOption>> transformOptions = new HashMap<>();
|
||||||
|
Set<Transformer> distinctTransformers = new HashSet<>(transformerTransformMapping.values());
|
||||||
{
|
{
|
||||||
for (Transformer transformer: transformerTransformMapping.values().stream().distinct().collect(Collectors.toList()) )
|
for (Transformer transformer: distinctTransformers)
|
||||||
{
|
{
|
||||||
transformerConfigs.addAll(transformer.getTransformConfig().getTransformers());
|
TransformConfig transformConfig = transformer.getTransformConfig();
|
||||||
transformOptions.putAll(transformer.getTransformConfig().getTransformOptions());
|
transformerConfigs.addAll(transformConfig.getTransformers());
|
||||||
|
transformOptions.putAll(transformConfig.getTransformOptions());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
2
pom.xml
2
pom.xml
@@ -42,7 +42,7 @@
|
|||||||
<module>alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot</module>
|
<module>alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot</module>
|
||||||
<module>alfresco-transform-misc/alfresco-transform-misc</module>
|
<module>alfresco-transform-misc/alfresco-transform-misc</module>
|
||||||
<module>alfresco-transform-misc/alfresco-transform-misc-boot</module>
|
<module>alfresco-transform-misc/alfresco-transform-misc-boot</module>
|
||||||
<module>alfresco-transform-aio/alfresco-transform-aio</module>
|
<module>alfresco-transform-core-aio/alfresco-transform-core-aio</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
|
Reference in New Issue
Block a user