inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-05-12 17:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ATS-191' into 'master'

Browse Source 
ATS-191 : Delete temp target files after SFS upload

See merge request Repository/alfresco-docker-transformers!26
This commit is contained in:
Cezar Leahu 2018-11-06 09:22:28 +00:00
commit 92df7da824
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java
View File

@ -27,6 +27,7 @@ package org.alfresco.transformer;
import static org.alfresco.transformer.fs.FileManager.buildFile; import static org.alfresco.transformer.fs.FileManager.buildFile;
import static org.alfresco.transformer.fs.FileManager.createTargetFileName; import static org.alfresco.transformer.fs.FileManager.createTargetFileName;
import static org.alfresco.transformer.fs.FileManager.deleteFile;
import static org.alfresco.transformer.fs.FileManager.getFilenameFromContentDisposition; import static org.alfresco.transformer.fs.FileManager.getFilenameFromContentDisposition;
import static org.alfresco.transformer.fs.FileManager.save; import static org.alfresco.transformer.fs.FileManager.save;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
@ -212,6 +213,15 @@ public abstract class AbstractTransformerController implements TransformControll
return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus())); return new ResponseEntity<>(reply, HttpStatus.valueOf(reply.getStatus()));
} }
try
{
deleteFile(targetFile);
}
catch (Exception e)
{
logger.error("Failed to delete target local temp file " + targetFile, e);
}
reply.setTargetReference(targetRef.getEntry().getFileRef()); reply.setTargetReference(targetRef.getEntry().getFileRef());
reply.setStatus(HttpStatus.CREATED.value()); reply.setStatus(HttpStatus.CREATED.value());

8
alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java
View File

@ -55,6 +55,14 @@ public class FileManager
return TempFileProvider.createTempFile("target_", "_" + filename); return TempFileProvider.createTempFile("target_", "_" + filename);
} }
public static void deleteFile(final File file) throws Exception
{
if (!file.delete())
{
throw new Exception("Failed to delete file");
}
}
/** /**
* Checks the filename is okay to uses in a temporary file name. * Checks the filename is okay to uses in a temporary file name.
* *