From 486144e5772faa1cd77b0870140ae1859060dc63 Mon Sep 17 00:00:00 2001 From: David Mason Date: Wed, 17 Jul 2013 08:26:47 +1000 Subject: [PATCH] make FileService.processAdapterFile static (mikado method) --- .../java/org/zanata/rest/service/FileService.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java index 27d435be68..d4b3210a84 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java @@ -227,7 +227,9 @@ private Response tryUploadSourceFile(String projectSlug, String iterationSlug, S { tempFile = Optional.of(persistTempFileFromUpload(uploadForm, translationFileServiceImpl)); } - processAdapterFile(tempFile.get(), projectSlug, iterationSlug, docId, uploadForm); + processAdapterFile(tempFile.get(), projectSlug, iterationSlug, docId, uploadForm, + virusScanner, documentDAO, documentServiceImpl, translationFileServiceImpl, + identity); } if (tempFile.isPresent()) { @@ -333,8 +335,13 @@ private static File persistTempFileFromUpload(DocumentFileUploadForm uploadForm, return tempFile; } - private void processAdapterFile(@Nonnull File tempFile, String projectSlug, String iterationSlug, - String docId, DocumentFileUploadForm uploadForm) + private static void processAdapterFile(@Nonnull File tempFile, String projectSlug, String iterationSlug, + String docId, DocumentFileUploadForm uploadForm, + VirusScanner virusScanner, + DocumentDAO documentDAO, + DocumentService documentServiceImpl, + TranslationFileService translationFileServiceImpl, + ZanataIdentity identity) { String name = projectSlug+":"+iterationSlug+":"+docId; try