REPO-4791 Use Local transforms where Legacy transforms are called.

- Transform count for transformationsByExtension list had gaps
This commit is contained in:
Alan Davis
2019-12-04 15:48:43 +00:00
parent 06d8251015
commit f44b11ead8

View File

@@ -1210,39 +1210,42 @@ public class TransformerDebug implements ApplicationContextAware
transformerConfig.getPriority(availableTransformer.get(1), sourceMimetype, targetMimetype))) transformerConfig.getPriority(availableTransformer.get(1), sourceMimetype, targetMimetype)))
{ {
// Log the transformers // Log the transformers
try LocalTransform localTransform = localTransformServiceRegistryImpl == null
{
pushMisc();
int transformerCount = 0;
LocalTransform localTransform = localTransformServiceRegistryImpl == null
? null ? null
: localTransformServiceRegistryImpl.getLocalTransform(sourceMimetype, : localTransformServiceRegistryImpl.getLocalTransform(sourceMimetype,
-1, targetMimetype, Collections.emptyMap(), null); -1, targetMimetype, Collections.emptyMap(), null);
if (localTransform != null) if (localTransform != null || size >= 1)
{
try
{ {
long maxSourceSizeKBytes = localTransformServiceRegistryImpl.findMaxSize(sourceMimetype, pushMisc();
targetMimetype, Collections.emptyMap(), null); int transformerCount = 0;
String transformName = localTransform instanceof AbstractLocalTransform if (localTransform != null)
? "Local:"+((AbstractLocalTransform)localTransform).getName()
: "";
activeTransformer(sourceMimetype, targetMimetype, transformerCount, " [0]",
transformName, maxSourceSizeKBytes, transformerCount++ == 0);
}
for (ContentTransformer transformer: availableTransformer)
{
if (!onlyNonDeterministic || transformerCount < 2 ||
priority == transformerConfig.getPriority(transformer, sourceMimetype, targetMimetype))
{ {
long maxSourceSizeKBytes = transformer.getMaxSourceSizeKBytes( long maxSourceSizeKBytes = localTransformServiceRegistryImpl.findMaxSize(sourceMimetype,
sourceMimetype, targetMimetype, options); targetMimetype, Collections.emptyMap(), null);
activeTransformer(sourceMimetype, targetMimetype, transformerCount, String transformName = localTransform instanceof AbstractLocalTransform
transformer, maxSourceSizeKBytes, transformerCount++ == 0); ? "Local:" + ((AbstractLocalTransform) localTransform).getName()
: "";
activeTransformer(sourceMimetype, targetMimetype, transformerCount, " [0]",
transformName, maxSourceSizeKBytes, transformerCount++ == 0);
}
for (ContentTransformer transformer: availableTransformer)
{
if (!onlyNonDeterministic || transformerCount < 2 ||
priority == transformerConfig.getPriority(transformer, sourceMimetype, targetMimetype))
{
long maxSourceSizeKBytes = transformer.getMaxSourceSizeKBytes(
sourceMimetype, targetMimetype, options);
activeTransformer(sourceMimetype, targetMimetype, transformerCount,
transformer, maxSourceSizeKBytes, transformerCount++ == 0);
}
} }
} }
} finally
finally {
{ popMisc();
popMisc(); }
} }
} }
} }