- Revision
- 1050
- Author
- mauro
- Date
- 2009-02-07 11:56:54 -0600 (Sat, 07 Feb 2009)
Log Message
Extracted file manager interface.
Modified Paths
- sandbox/jbehave-web/web-io/src/main/java/org/jbehave/web/io/FileManager.java
- sandbox/jbehave-web/web-waffle/src/main/java/org/jbehave/web/waffle/JBehaveRegistrar.java
Added Paths
Diff
Modified: sandbox/jbehave-web/web-io/src/main/java/org/jbehave/web/io/FileManager.java (1049 => 1050)
--- sandbox/jbehave-web/web-io/src/main/java/org/jbehave/web/io/FileManager.java 2009-02-07 17:50:53 UTC (rev 1049) +++ sandbox/jbehave-web/web-io/src/main/java/org/jbehave/web/io/FileManager.java 2009-02-07 17:56:54 UTC (rev 1050) @@ -3,145 +3,17 @@ */ package org.jbehave.web.io; -import static java.util.Arrays.asList; -import static org.apache.commons.lang.StringUtils.isBlank; -import static org.apache.commons.lang.StringUtils.removeEnd; - import java.io.File; -import java.io.FileFilter; -import java.util.ArrayList; import java.util.List; import org.apache.commons.fileupload.FileItem; -import org.jbehave.web.io.FileUnzipper.FileUnzipFailedException; -public class FileManager { +public interface FileManager { - private static final String ZIP = ".zip"; - private static final String UPLOAD_PATH = System - .getProperty("java.io.tmpdir") - + File.separator + "upload"; + List<File> list(); - private final FileUnzipper unzipper; - private File uploadDir; + void delete(List<String> paths); - public FileManager(FileUnzipper unzipper) { - this.unzipper = unzipper; - } + List<File> write(List<FileItem> fileItems, List<String> errors); - public File uploadDirectory() { - if (uploadDir == null) { - uploadDir = new File(UPLOAD_PATH); - uploadDir.mkdirs(); - } - return uploadDir; - } - - public List<File> list() { - return asList(uploadDirectory().listFiles(new FileFilter(){ - public boolean accept(File file) { - return !file.isDirectory(); - } - })); - } - - public void delete(List<String> paths) { - for (String path : paths) { - deleteFile(new File(path)); - } - } - - private boolean deleteFile(File file) { - if (file.isDirectory()) { - // recursively delete children - for (String child : file.list()) { - if (!deleteFile(new File(file, child))) { - return false; - } - } - } - if ( isZip(file) ){ - deleteFile(withoutZip(file)); - } - return file.delete(); - } - - private File withoutZip(File file) { - return new File(removeEnd(file.getPath(), ZIP)); - } - - public List<File> write(List<FileItem> fileItems, List<String> errors) { - List<File> files = new ArrayList<File>(); - File directory = uploadDirectory(); - for (FileItem item : fileItems) { - try { - File file = writeItemToFile(directory, item); - files.add(file); - if (isZip(file)) { - try { - unzipper.unzip(file, directory); - } catch (FileUnzipFailedException e) { - errors.add(e.getMessage()); - } - } - } catch (FileItemNameMissingException e) { - // ignore and carry on - } catch (FileAlreadyExistsException e) { - errors.add(e.getMessage()); - } catch (FileWriteFailedException e) { - errors.add(e.getMessage()); - } - } - return files; - } - - private boolean isZip(File file) { - return file.getName().endsWith(ZIP); - } - - private File writeItemToFile(File directory, FileItem item) { - if (isBlank(item.getName())) { - throw new FileItemNameMissingException(item); - } - File file = new File(directory, item.getName()); - if (file.exists()) { - throw new FileAlreadyExistsException(file); - } - try { - item.write(file); - } catch (Exception e) { - throw new FileWriteFailedException(file, e); - } - return file; - } - - @SuppressWarnings("serial") - public static final class FileItemNameMissingException extends - RuntimeException { - - public FileItemNameMissingException(FileItem file) { - super(file.toString()); - } - - } - - @SuppressWarnings("serial") - public static final class FileAlreadyExistsException extends - RuntimeException { - - public FileAlreadyExistsException(File file) { - super(file.toString() + " already exists"); - } - - } - - @SuppressWarnings("serial") - public static final class FileWriteFailedException extends RuntimeException { - - public FileWriteFailedException(File file, Throwable cause) { - super(file.toString() + " write failed", cause); - } - - } - } \ No newline at end of file
Added: sandbox/jbehave-web/web-io/src/main/java/org/jbehave/web/io/UnzippingFileManager.java (0 => 1050)
--- sandbox/jbehave-web/web-io/src/main/java/org/jbehave/web/io/UnzippingFileManager.java (rev 0) +++ sandbox/jbehave-web/web-io/src/main/java/org/jbehave/web/io/UnzippingFileManager.java 2009-02-07 17:56:54 UTC (rev 1050) @@ -0,0 +1,147 @@ +/** + * + */ +package org.jbehave.web.io; + +import static java.util.Arrays.asList; +import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang.StringUtils.removeEnd; + +import java.io.File; +import java.io.FileFilter; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.fileupload.FileItem; +import org.jbehave.web.io.FileUnzipper.FileUnzipFailedException; + +public class UnzippingFileManager implements FileManager { + + private static final String ZIP = ".zip"; + private static final String UPLOAD_PATH = System + .getProperty("java.io.tmpdir") + + File.separator + "upload"; + + private final FileUnzipper unzipper; + private File uploadDir; + + public UnzippingFileManager(FileUnzipper unzipper) { + this.unzipper = unzipper; + } + + public File uploadDirectory() { + if (uploadDir == null) { + uploadDir = new File(UPLOAD_PATH); + uploadDir.mkdirs(); + } + return uploadDir; + } + + public List<File> list() { + return asList(uploadDirectory().listFiles(new FileFilter(){ + public boolean accept(File file) { + return !file.isDirectory(); + } + })); + } + + public void delete(List<String> paths) { + for (String path : paths) { + deleteFile(new File(path)); + } + } + + private boolean deleteFile(File file) { + if (file.isDirectory()) { + // recursively delete children + for (String child : file.list()) { + if (!deleteFile(new File(file, child))) { + return false; + } + } + } + if ( isZip(file) ){ + deleteFile(withoutZip(file)); + } + return file.delete(); + } + + private File withoutZip(File file) { + return new File(removeEnd(file.getPath(), ZIP)); + } + + public List<File> write(List<FileItem> fileItems, List<String> errors) { + List<File> files = new ArrayList<File>(); + File directory = uploadDirectory(); + for (FileItem item : fileItems) { + try { + File file = writeItemToFile(directory, item); + files.add(file); + if (isZip(file)) { + try { + unzipper.unzip(file, directory); + } catch (FileUnzipFailedException e) { + errors.add(e.getMessage()); + } + } + } catch (FileItemNameMissingException e) { + // ignore and carry on + } catch (FileAlreadyExistsException e) { + errors.add(e.getMessage()); + } catch (FileWriteFailedException e) { + errors.add(e.getMessage()); + } + } + return files; + } + + private boolean isZip(File file) { + return file.getName().endsWith(ZIP); + } + + private File writeItemToFile(File directory, FileItem item) { + if (isBlank(item.getName())) { + throw new FileItemNameMissingException(item); + } + File file = new File(directory, item.getName()); + if (file.exists()) { + throw new FileAlreadyExistsException(file); + } + try { + item.write(file); + } catch (Exception e) { + throw new FileWriteFailedException(file, e); + } + return file; + } + + @SuppressWarnings("serial") + public static final class FileItemNameMissingException extends + RuntimeException { + + public FileItemNameMissingException(FileItem file) { + super(file.toString()); + } + + } + + @SuppressWarnings("serial") + public static final class FileAlreadyExistsException extends + RuntimeException { + + public FileAlreadyExistsException(File file) { + super(file.toString() + " already exists"); + } + + } + + @SuppressWarnings("serial") + public static final class FileWriteFailedException extends RuntimeException { + + public FileWriteFailedException(File file, Throwable cause) { + super(file.toString() + " write failed", cause); + } + + } + +} \ No newline at end of file
Modified: sandbox/jbehave-web/web-waffle/src/main/java/org/jbehave/web/waffle/JBehaveRegistrar.java (1049 => 1050)
--- sandbox/jbehave-web/web-waffle/src/main/java/org/jbehave/web/waffle/JBehaveRegistrar.java 2009-02-07 17:50:53 UTC (rev 1049) +++ sandbox/jbehave-web/web-waffle/src/main/java/org/jbehave/web/waffle/JBehaveRegistrar.java 2009-02-07 17:56:54 UTC (rev 1050) @@ -17,8 +17,8 @@ import org.jbehave.scenario.ScenarioRunner; import org.jbehave.scenario.parser.PatternScenarioParser; import org.jbehave.scenario.steps.Steps; -import org.jbehave.web.io.FileManager; import org.jbehave.web.io.FileUnzipper; +import org.jbehave.web.io.UnzippingFileManager; import org.jbehave.web.waffle.controllers.FileUploadController; import org.jbehave.web.waffle.controllers.FilesController; import org.jbehave.web.waffle.controllers.ScenarioController; @@ -37,8 +37,8 @@ registerScenarioRunner(); registerSteps(); register("scenario/scenario", ScenarioController.class); - register("manager", FileManager.class); register("unzipper", FileUnzipper.class); + register("manager", UnzippingFileManager.class); register("data/files", FilesController.class); configureViews(); }
To unsubscribe from this list please visit:
