inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save point: [skip ci]

Browse Source 
* cleaning up TransformController - more to do
* wire up all transforms
This commit is contained in:
alandavis
2022-07-06 17:38:15 +01:00
parent 0eb8d9e142
commit 2e17c3ec53
29 changed files with 862 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
model/src/main/java/org/alfresco/transform/common/TransformerDebug.java
View File

@@ -79,10 +79,15 @@ public class TransformerDebug
}
public void pushTransform(String reference, String sourceMimetype, String targetMimetype, File sourceFile, String transformerName)
{
final long sourceSizeInBytes = sourceFile.length();
pushTransform(reference, sourceMimetype, targetMimetype, sourceSizeInBytes, transformerName);
}
public void pushTransform(String reference, String sourceMimetype, String targetMimetype, long sourceSizeInBytes, String transformerName)
{
if (logger.isDebugEnabled())
{
final long sourceSizeInBytes = sourceFile.length();
String message = getPaddedReference(reference) +
getMimetypeExt(sourceMimetype) +
getTargetMimetypeExt(targetMimetype, sourceMimetype) + ' ' +

8
model/src/main/java/org/alfresco/transform/registry/TransformCache.java
View File

@@ -74,19 +74,19 @@ public class TransformCache
return transforms;
}
public void cache(final String transformerName, final String sourceMimetype,
public void cache(final String renditionName, final String sourceMimetype,
final List<SupportedTransform> transformListBySize)
{
cachedSupportedTransformList
.get(transformerName)
.get(renditionName)
.put(sourceMimetype, transformListBySize);
}
public List<SupportedTransform> retrieveCached(final String transformerName,
public List<SupportedTransform> retrieveCached(final String renditionName,
final String sourceMimetype)
{
return cachedSupportedTransformList
.computeIfAbsent(transformerName, k -> new ConcurrentHashMap<>())
.computeIfAbsent(renditionName, k -> new ConcurrentHashMap<>())
.get(sourceMimetype);
}

19
model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java
View File

@@ -75,20 +75,20 @@ class TransformRegistryHelper
// been discarded.
static List<SupportedTransform> retrieveTransformListBySize(final TransformCache data,
final String sourceMimetype, final String targetMimetype,
Map<String, String> actualOptions, String transformerName)
Map<String, String> actualOptions, String renditionName)
{
if (actualOptions == null)
{
actualOptions = emptyMap();
}
if (transformerName != null && transformerName.trim().isEmpty())
if (renditionName != null && renditionName.trim().isEmpty())
{
transformerName = null;
renditionName = null;
}
final List<SupportedTransform> cachedTransformList =
transformerName == null ? null :
data.retrieveCached(transformerName, sourceMimetype);
renditionName == null ? null :
data.retrieveCached(renditionName, sourceMimetype);
if (cachedTransformList != null)
{
return cachedTransformList;
@@ -99,9 +99,9 @@ class TransformRegistryHelper
targetMimetype,
filterTimeout(actualOptions));
if (transformerName != null)
if (renditionName != null)
{
data.cache(transformerName, sourceMimetype, builtTransformList);
data.cache(renditionName, sourceMimetype, builtTransformList);
}
return builtTransformList;
@@ -111,13 +111,12 @@ class TransformRegistryHelper
final TransformCache data, final String sourceMimetype, final String targetMimetype,
final Map<String, String> actualOptions)
{
if(sourceMimetype == null)
if (sourceMimetype == null)
{
throw new TransformException(400, "Null value provided for sourceMimetype, please provide a value");
}
if(targetMimetype == null)
if (targetMimetype == null)
{
throw new TransformException(400, "Null value provided for tragetMimetype, please provide a value");
}