JAMES-1982 Create Sieve file folder in constructor
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/184c2b5c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/184c2b5c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/184c2b5c Branch: refs/heads/master Commit: 184c2b5c9015ad977309becf9d4ed42bf72de971 Parents: fe92e8b Author: benwa <btell...@linagora.com> Authored: Sat Apr 1 11:35:37 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Mon Apr 3 18:09:32 2017 +0700 ---------------------------------------------------------------------- .../managesieve/file/host/FileHostSystem.java | 2 - .../file/SieveFileRepository.java | 55 ++++++++------------ .../file/SieveFileRepositoryTest.java | 2 - 3 files changed, 21 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/184c2b5c/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java index 389209c..7bd28dc 100644 --- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java +++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java @@ -52,8 +52,6 @@ public class FileHostSystem extends JamesManageSieveHostSystem { } protected static SieveRepository createSieveRepository() throws Exception { - File root = getFileSystem().getFile(SIEVE_ROOT); - FileUtils.forceMkdir(root); return new SieveFileRepository(fileSystem); } http://git-wip-us.apache.org/repos/asf/james-project/blob/184c2b5c/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java index af9b2ba..221320e 100644 --- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java @@ -20,20 +20,6 @@ package org.apache.james.sieverepository.file; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.james.filesystem.api.FileSystem; -import org.apache.james.sieverepository.api.ScriptSummary; -import org.apache.james.sieverepository.api.SieveRepository; -import org.apache.james.sieverepository.api.exception.DuplicateException; -import org.apache.james.sieverepository.api.exception.IsActiveException; -import org.apache.james.sieverepository.api.exception.QuotaExceededException; -import org.apache.james.sieverepository.api.exception.QuotaNotFoundException; -import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; -import org.apache.james.sieverepository.api.exception.StorageException; -import org.joda.time.DateTime; - -import javax.inject.Inject; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -49,6 +35,21 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.Scanner; +import javax.inject.Inject; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.james.filesystem.api.FileSystem; +import org.apache.james.sieverepository.api.ScriptSummary; +import org.apache.james.sieverepository.api.SieveRepository; +import org.apache.james.sieverepository.api.exception.DuplicateException; +import org.apache.james.sieverepository.api.exception.IsActiveException; +import org.apache.james.sieverepository.api.exception.QuotaExceededException; +import org.apache.james.sieverepository.api.exception.QuotaNotFoundException; +import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; +import org.apache.james.sieverepository.api.exception.StorageException; +import org.joda.time.DateTime; + /** * <code>SieveFileRepository</code> manages sieve scripts stored on the file system. * <p>The sieve root directory is a sub-directory of the application base directory named "sieve". @@ -65,7 +66,7 @@ public class SieveFileRepository implements SieveRepository { private static final int MAX_BUFF_SIZE = 32768; public static final String SIEVE_EXTENSION = ".sieve"; - private FileSystem _fileSystem = null; + private final FileSystem fileSystem; private final Object lock = new Object(); /** @@ -134,25 +135,11 @@ public class SieveFileRepository implements SieveRepository { } } - /** - * Creates a new instance of SieveFileRepository. - */ - public SieveFileRepository() { - - } - - /** - * Creates a new instance of SieveFileRepository. - * - * @param fileSystem - */ - public SieveFileRepository(FileSystem fileSystem) { - setFileSystem(fileSystem); - } - @Inject - public void setFileSystem(FileSystem fileSystem) { - _fileSystem = fileSystem; + public SieveFileRepository(FileSystem fileSystem) throws IOException { + this.fileSystem = fileSystem; + File root = fileSystem.getFile(SIEVE_ROOT); + FileUtils.forceMkdir(root); } @Override @@ -318,7 +305,7 @@ public class SieveFileRepository implements SieveRepository { protected File getSieveRootDirectory() throws StorageException { try { - return _fileSystem.getFile(SIEVE_ROOT); + return fileSystem.getFile(SIEVE_ROOT); } catch (FileNotFoundException ex1) { throw new StorageException(ex1); } http://git-wip-us.apache.org/repos/asf/james-project/blob/184c2b5c/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java index d1e3bc0..f2a7daf 100644 --- a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java @@ -35,8 +35,6 @@ public class SieveFileRepositoryTest extends AbstractSieveRepositoryTest { @Override protected SieveRepository createSieveRepository() throws Exception { - File root = fileSystem.getFile(SIEVE_ROOT); - FileUtils.forceMkdir(root); return new SieveFileRepository(fileSystem); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
