From de40f38d43ab1480d9048127339fac642d637b06 Mon Sep 17 00:00:00 2001 From: Erik Knizat Date: Thu, 2 Apr 2020 13:53:20 +0100 Subject: [PATCH] Fix formatting and rename the module as per review comments --- .../alfresco-transform-core-aio}/pom.xml | 4 ++-- .../transformers/AbstractTransformer.java | 9 +++++++-- .../transformers/AllInOneTransformer.java | 20 +++++++++++-------- .../transformer/transformers/MiscAdapter.java | 0 .../transformer/transformers/TikaAdapter.java | 0 .../transformer/transformers/Transformer.java | 0 .../transformers/AllInOneTransformerTest.java | 0 pom.xml | 2 +- 8 files changed, 22 insertions(+), 13 deletions(-) rename {alfresco-transform-aio/alfresco-transform-aio => alfresco-transform-core-aio/alfresco-transform-core-aio}/pom.xml (94%) rename {alfresco-transform-aio/alfresco-transform-aio => alfresco-transform-core-aio/alfresco-transform-core-aio}/src/main/java/org/alfresco/transformer/transformers/AbstractTransformer.java (91%) rename {alfresco-transform-aio/alfresco-transform-aio => alfresco-transform-core-aio/alfresco-transform-core-aio}/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java (85%) rename {alfresco-transform-aio/alfresco-transform-aio => alfresco-transform-core-aio/alfresco-transform-core-aio}/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java (100%) rename {alfresco-transform-aio/alfresco-transform-aio => alfresco-transform-core-aio/alfresco-transform-core-aio}/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java (100%) rename {alfresco-transform-aio/alfresco-transform-aio => alfresco-transform-core-aio/alfresco-transform-core-aio}/src/main/java/org/alfresco/transformer/transformers/Transformer.java (100%) rename {alfresco-transform-aio/alfresco-transform-aio => alfresco-transform-core-aio/alfresco-transform-core-aio}/src/test/java/org/alfresco/transformer/transformers/AllInOneTransformerTest.java (100%) diff --git a/alfresco-transform-aio/alfresco-transform-aio/pom.xml b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml similarity index 94% rename from alfresco-transform-aio/alfresco-transform-aio/pom.xml rename to alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml index 141d172b..0d97ed26 100644 --- a/alfresco-transform-aio/alfresco-transform-aio/pom.xml +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml @@ -3,8 +3,8 @@ 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"> 4.0.0 - alfresco-transform-aio - Alfresco All In One Transformer + alfresco-transform-core-aio + Alfresco Core All-In-One Transformer jar diff --git a/alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/AbstractTransformer.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AbstractTransformer.java similarity index 91% rename from alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/AbstractTransformer.java rename to alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AbstractTransformer.java index d7252245..aff9f669 100644 --- a/alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/AbstractTransformer.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AbstractTransformer.java @@ -54,10 +54,15 @@ public abstract class AbstractTransformer implements Transformer 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(); diff --git a/alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java similarity index 85% rename from alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java rename to alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java index cfc791d3..4d81f487 100644 --- a/alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/AllInOneTransformer.java @@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -61,9 +62,10 @@ public class AllInOneTransformer implements Transformer { this.registerTransformer(new MiscAdapter()); 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); } } @@ -87,7 +89,7 @@ public class AllInOneTransformer implements 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); Transformer transformer = transformerTransformMapping.get(transformName); - if(transformer == null) + if (transformer == null) { throw new Exception("No transformer mapping for : transform:" + transformName + " sourceMimetype:" + sourceMimetype + " targetMimetype:" + targetMimetype); @@ -106,7 +108,7 @@ public class AllInOneTransformer implements Transformer 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); } @@ -118,11 +120,13 @@ public class AllInOneTransformer implements Transformer // Merge the config for all sub transformers List transformerConfigs = new LinkedList<>(); Map> transformOptions = new HashMap<>(); + Set distinctTransformers = new HashSet<>(transformerTransformMapping.values()); { - for (Transformer transformer: transformerTransformMapping.values().stream().distinct().collect(Collectors.toList()) ) + for (Transformer transformer: distinctTransformers) { - transformerConfigs.addAll(transformer.getTransformConfig().getTransformers()); - transformOptions.putAll(transformer.getTransformConfig().getTransformOptions()); + TransformConfig transformConfig = transformer.getTransformConfig(); + transformerConfigs.addAll(transformConfig.getTransformers()); + transformOptions.putAll(transformConfig.getTransformOptions()); } } diff --git a/alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java similarity index 100% rename from alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java rename to alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/MiscAdapter.java diff --git a/alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java similarity index 100% rename from alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java rename to alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/TikaAdapter.java diff --git a/alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/Transformer.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/Transformer.java similarity index 100% rename from alfresco-transform-aio/alfresco-transform-aio/src/main/java/org/alfresco/transformer/transformers/Transformer.java rename to alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/Transformer.java diff --git a/alfresco-transform-aio/alfresco-transform-aio/src/test/java/org/alfresco/transformer/transformers/AllInOneTransformerTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transformer/transformers/AllInOneTransformerTest.java similarity index 100% rename from alfresco-transform-aio/alfresco-transform-aio/src/test/java/org/alfresco/transformer/transformers/AllInOneTransformerTest.java rename to alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transformer/transformers/AllInOneTransformerTest.java diff --git a/pom.xml b/pom.xml index d997a0c6..1e125721 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot alfresco-transform-misc/alfresco-transform-misc alfresco-transform-misc/alfresco-transform-misc-boot - alfresco-transform-aio/alfresco-transform-aio + alfresco-transform-core-aio/alfresco-transform-core-aio