mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2025-08-14 17:58:27 +00:00
Batch changes from of review comments - there are more
This commit is contained in:
@@ -21,15 +21,6 @@
|
||||
*/
|
||||
package org.alfresco.transform.common;
|
||||
|
||||
import static java.util.Arrays.stream;
|
||||
import static java.util.Collections.unmodifiableSet;
|
||||
import static java.util.stream.Collectors.toSet;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Mimetype
|
||||
* <p>
|
||||
|
@@ -197,7 +197,7 @@ public class TransformerDebug
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug(getPaddedReference(reference) + " fragment["+index+"] "+fileSize(size));
|
||||
logger.debug("%s fragment[%d]%s", getPaddedReference(reference), index, fileSize(size));
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -27,6 +27,10 @@ import org.springframework.core.io.Resource;
|
||||
|
||||
public class TransformConfigReaderFactory
|
||||
{
|
||||
private TransformConfigReaderFactory()
|
||||
{
|
||||
}
|
||||
|
||||
public static TransformConfigReader create(final Resource resource)
|
||||
{
|
||||
final String fileName = resource.getFilename();
|
||||
|
@@ -34,10 +34,7 @@ import org.springframework.core.io.ResourceLoader;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.Reader;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
|
||||
|
||||
/**
|
||||
|
@@ -22,9 +22,9 @@
|
||||
package org.alfresco.transform.registry;
|
||||
|
||||
import org.alfresco.transform.config.AddSupported;
|
||||
import org.alfresco.transform.config.SupportedDefaults;
|
||||
import org.alfresco.transform.config.OverrideSupported;
|
||||
import org.alfresco.transform.config.RemoveSupported;
|
||||
import org.alfresco.transform.config.SupportedDefaults;
|
||||
import org.alfresco.transform.config.SupportedSourceAndTarget;
|
||||
import org.alfresco.transform.config.TransformConfig;
|
||||
import org.alfresco.transform.config.TransformOption;
|
||||
@@ -32,7 +32,6 @@ import org.alfresco.transform.config.TransformStep;
|
||||
import org.alfresco.transform.config.Transformer;
|
||||
import org.alfresco.transform.config.TransformerAndTypes;
|
||||
import org.alfresco.transform.config.Types;
|
||||
import org.apache.commons.lang3.tuple.Triple;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
@@ -21,11 +21,6 @@
|
||||
*/
|
||||
package org.alfresco.transform.registry;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Wraps an object so that we know where it was read from. The equals() and hashcode() are that of the wrapped object
|
||||
* so it is still possible do set operations.
|
||||
|
@@ -44,6 +44,10 @@ import static org.springframework.http.HttpStatus.BAD_REQUEST;
|
||||
|
||||
class TransformRegistryHelper
|
||||
{
|
||||
private TransformRegistryHelper()
|
||||
{
|
||||
}
|
||||
|
||||
static Set<TransformOption> lookupTransformOptions(final Set<String> transformOptionNames,
|
||||
final Map<String, Set<TransformOption>> transformOptions, final String readFrom,
|
||||
final Consumer<String> logError)
|
||||
|
@@ -40,6 +40,7 @@ import static java.util.Collections.emptyMap;
|
||||
import static java.util.Collections.emptySet;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertSame;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
@@ -255,7 +256,7 @@ public class CombinedTransformConfigTest
|
||||
assertEquals(numberOfTEngineTransformers, transformConfig.getTransformers().size());
|
||||
Transformer actualTransformer = transformConfig.getTransformers().get(numberOfTEngineTransformers - 1);
|
||||
assertEquals(expectedTransformer, actualTransformer);
|
||||
assertTrue(expectedTransformer == actualTransformer);
|
||||
assertSame(expectedTransformer, actualTransformer);
|
||||
|
||||
// Check the baseUrl is that of the original t-engine that will do the work, if the overriding transform
|
||||
// is a single step transform.
|
||||
|
Reference in New Issue
Block a user