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

MNT-24883 refactored code

Browse Source
This commit is contained in:
bsayan2
2025-05-29 16:49:59 +05:30
parent f8247379ca
commit ab433ff65a
2 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
engines/base/src/main/java/org/alfresco/transform/base/fs/FileManager.java
View File

@@ -67,21 +67,23 @@ public class FileManager
private FileManager() private FileManager()
{} {}
public static File createSourceFile(HttpServletRequest request, InputStream inputStream, String sourceMimetype) public static File createSourceFile(HttpServletRequest request, InputStream inputStream, String sourceMimetype, String sourceFileName)
{ {
try try
{ {
String extension = "." + getExtensionForMimetype(sourceMimetype); if (sourceFileName == null && request != null && request.getParts() != null)
File file = (request != null && request.getParts() != null) {
? createFileFromRequest(request, extension) sourceFileName = request.getParts().stream()
: TempFileProvider.createTempFile("source_", extension); .filter(part -> Objects.nonNull(part) && StringUtils.isNotEmpty(part.getSubmittedFileName()))
.map(Part::getSubmittedFileName)
Files.copy(inputStream, file.toPath(), REPLACE_EXISTING); .findAny()
.orElse(null);
}
File file = createSourceFileWithName(sourceFileName, inputStream, sourceMimetype);
if (request != null) if (request != null)
{ {
request.setAttribute(SOURCE_FILE, file); request.setAttribute(SOURCE_FILE, file);
} }
LogEntry.setSource(file.getName(), file.length());
return file; return file;
} }
catch (Exception e) catch (Exception e)
@@ -90,27 +92,7 @@ public class FileManager
} }
} }
private static File createFileFromRequest(HttpServletRequest request, String extension) public static File createSourceFileWithName(String sourceFileName, InputStream inputStream, String sourceMimetype)
{
try
{
String submittedFileName = request.getParts().stream()
.filter(part -> Objects.nonNull(part) && StringUtils.isNotEmpty(part.getSubmittedFileName()))
.map(Part::getSubmittedFileName)
.findAny()
.orElse(null);
return StringUtils.isNotEmpty(submittedFileName)
? TempFileProvider.createFileWithinUUIDTempDir(submittedFileName)
: TempFileProvider.createTempFile("source_", extension);
}
catch (Exception e)
{
throw new TransformException(INTERNAL_SERVER_ERROR, "Failed to create source file from request", e);
}
}
public static File createSourceFileUsingOriginalFileName(String sourceFileName, InputStream inputStream, String sourceMimetype)
{ {
try try
{ {

4
engines/base/src/main/java/org/alfresco/transform/base/transform/TransformManagerImpl.java
View File

@@ -176,9 +176,7 @@ public class TransformManagerImpl implements TransformManager
if (sourceFile == null) if (sourceFile == null)
{ {
sourceFile = request == null sourceFile = FileManager.createSourceFile(request, inputStream, sourceMimetype, sourceFileName);
? FileManager.createSourceFileUsingOriginalFileName(sourceFileName, inputStream, sourceMimetype)
: FileManager.createSourceFile(request, inputStream, sourceMimetype);
} }
return sourceFile; return sourceFile;
} }