inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Repo-4710 Exclude duplicates wildcard with the first transformer, if it has the same options.

Browse Source
This commit is contained in:
Alan Davis
2020-02-22 22:22:42 +00:00
parent 3ce2557249
commit 3ab25de00e
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java
View File

@@ -48,6 +48,7 @@ import org.apache.http.util.EntityUtils;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@@ -369,6 +370,7 @@ public class CombinedConfig
boolean first = true; boolean first = true;
String sourceMediaType = null; String sourceMediaType = null;
Set<SupportedSourceAndTarget> sourceMediaTypesAndMaxSizes = null; Set<SupportedSourceAndTarget> sourceMediaTypesAndMaxSizes = null;
Set<String> firstTransformOptions = null;
for (TransformStep step : pipeline) for (TransformStep step : pipeline)
{ {
String name = step.getTransformerName(); String name = step.getTransformerName();
@@ -386,6 +388,7 @@ public class CombinedConfig
filter(s -> stepTrg.equals(s.getTargetMediaType())). filter(s -> stepTrg.equals(s.getTargetMediaType())).
collect(Collectors.toSet()); collect(Collectors.toSet());
sourceMediaType = stepTrg; sourceMediaType = stepTrg;
firstTransformOptions = stepTransformer.getTransformOptions();
} }
else else
{ {
@@ -405,8 +408,13 @@ public class CombinedConfig
withTargetMediaType(trg).build())). withTargetMediaType(trg).build())).
collect(Collectors.toSet()); collect(Collectors.toSet());
// Exclude duplicates with the first transformer, as there is no point doing more work. // Exclude duplicates with the first transformer, if it has the same options.
supportedSourceAndTargets.removeAll(sourceMediaTypesAndMaxSizes); // There is no point doing more work.
Set<String> transformOptions = transformer.getTransformOptions();
if (sameOptions(transformOptions, firstTransformOptions))
{
supportedSourceAndTargets.removeAll(sourceMediaTypesAndMaxSizes);
}
transformer.setSupportedSourceAndTargetList(supportedSourceAndTargets); transformer.setSupportedSourceAndTargetList(supportedSourceAndTargets);
} }
@@ -428,4 +436,25 @@ public class CombinedConfig
} }
}); });
} }
private boolean sameOptions(Set<String> transformOptionNames1, Set<String> transformOptionNames2)
{
// They have the same names
if (transformOptionNames1.equals(transformOptionNames2))
{
return true;
}
// Check the actual options.
Set<TransformOption> transformOptions1 = getTransformOptions(transformOptionNames1);
Set<TransformOption> transformOptions2 = getTransformOptions(transformOptionNames2);
return transformOptions1.equals(transformOptions2);
}
private Set<TransformOption> getTransformOptions(Set<String> transformOptionNames)
{
Set<TransformOption> transformOptions = new HashSet<>();
transformOptionNames.forEach(name->transformOptions.addAll(combinedTransformOptions.get(name)));
return transformOptions;
}
} }