From 7fba38d78a185aa7fd1656427a0403c9e996cde6 Mon Sep 17 00:00:00 2001 From: Markus Kreusch Date: Wed, 2 Mar 2016 22:56:55 +0100 Subject: [PATCH] BlockAlignedFileSystem no longer instantiable from other projects --- .../blockaligned/BlockAlignedFileSystem.java | 25 ---------- .../BlockAlignedFile.java | 2 +- .../BlockAlignedFileSystem.java} | 49 +++++++++++++++---- .../BlockAlignedFileSystemFactory.java | 2 +- .../BlockAlignedFolder.java | 2 +- .../BlockAlignedReadableFile.java | 2 +- .../BlockAlignedWritableFile.java | 2 +- .../crypto/CryptoFileSystemFactory.java | 1 - .../BlockAlignedReadableFileTest.java | 3 +- .../BlockAlignedWritableFileTest.java | 3 +- 10 files changed, 49 insertions(+), 42 deletions(-) delete mode 100644 main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFileSystem.java rename main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/{blockaligned => crypto}/BlockAlignedFile.java (95%) rename main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/{blockaligned/package-info.java => crypto/BlockAlignedFileSystem.java} (54%) rename main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/{blockaligned => crypto}/BlockAlignedFileSystemFactory.java (94%) rename main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/{blockaligned => crypto}/BlockAlignedFolder.java (95%) rename main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/{blockaligned => crypto}/BlockAlignedReadableFile.java (98%) rename main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/{blockaligned => crypto}/BlockAlignedWritableFile.java (98%) rename main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/{blockaligned => crypto}/BlockAlignedReadableFileTest.java (96%) rename main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/{blockaligned => crypto}/BlockAlignedWritableFileTest.java (95%) diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFileSystem.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFileSystem.java deleted file mode 100644 index 391287ab4..000000000 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFileSystem.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2016 Sebastian Stenzel and others. - * This file is licensed under the terms of the MIT license. - * See the LICENSE.txt file for more info. - * - * Contributors: - * Sebastian Stenzel - initial API and implementation - *******************************************************************************/ -package org.cryptomator.filesystem.blockaligned; - -import org.cryptomator.filesystem.Folder; -import org.cryptomator.filesystem.delegating.DelegatingFileSystem; - -class BlockAlignedFileSystem extends BlockAlignedFolder implements DelegatingFileSystem { - - public BlockAlignedFileSystem(Folder delegate, int blockSize) { - super(null, delegate, blockSize); - } - - @Override - public Folder getDelegate() { - return delegate; - } - -} diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFile.java similarity index 95% rename from main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFile.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFile.java index dc3fb6797..ebd716a90 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFile.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFile.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.filesystem.blockaligned; +package org.cryptomator.filesystem.crypto; import java.io.UncheckedIOException; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/package-info.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFileSystem.java similarity index 54% rename from main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/package-info.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFileSystem.java index 2ca086095..b2a68ff54 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/package-info.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFileSystem.java @@ -1,11 +1,16 @@ /******************************************************************************* - * Copyright (c) 2015 Sebastian Stenzel and others. + * Copyright (c) 2015, 2016 Sebastian Stenzel and others. * This file is licensed under the terms of the MIT license. * See the LICENSE.txt file for more info. * * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ +package org.cryptomator.filesystem.crypto; + +import org.cryptomator.filesystem.Folder; +import org.cryptomator.filesystem.delegating.DelegatingFileSystem; + /** * Provides a decoration layer for the {@link org.cryptomator.filesystem Filesystem API}, which guarantees, that all read/write attempts to underlying files always begin at a block start position. * Block start positions are integer multiples of a block size + a fixed block shift. @@ -15,16 +20,42 @@ * * * - * + * + * + * + * * * - * - * - * - * - * - * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * * *
Requested ReadPhysical Read
Requested ReadPhysical Read
00
50
90
1010
1110
3530
00
50
90
1010
1110
3530
*/ -package org.cryptomator.filesystem.blockaligned; \ No newline at end of file +class BlockAlignedFileSystem extends BlockAlignedFolder implements DelegatingFileSystem { + + public BlockAlignedFileSystem(Folder delegate, int blockSize) { + super(null, delegate, blockSize); + } + + @Override + public Folder getDelegate() { + return delegate; + } + +} diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFileSystemFactory.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFileSystemFactory.java similarity index 94% rename from main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFileSystemFactory.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFileSystemFactory.java index 692668467..f98efb479 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFileSystemFactory.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFileSystemFactory.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.filesystem.blockaligned; +package org.cryptomator.filesystem.crypto; import static org.cryptomator.crypto.engine.impl.Constants.PAYLOAD_SIZE; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFolder.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFolder.java similarity index 95% rename from main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFolder.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFolder.java index 14aede9bf..5a930ad6a 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedFolder.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedFolder.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.filesystem.blockaligned; +package org.cryptomator.filesystem.crypto; import org.cryptomator.filesystem.File; import org.cryptomator.filesystem.Folder; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedReadableFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFile.java similarity index 98% rename from main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedReadableFile.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFile.java index 289a13132..34e37e925 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedReadableFile.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFile.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.filesystem.blockaligned; +package org.cryptomator.filesystem.crypto; import java.io.UncheckedIOException; import java.nio.ByteBuffer; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedWritableFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedWritableFile.java similarity index 98% rename from main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedWritableFile.java rename to main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedWritableFile.java index a80fb87b5..ba46b4974 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/blockaligned/BlockAlignedWritableFile.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedWritableFile.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.filesystem.blockaligned; +package org.cryptomator.filesystem.crypto; import java.io.UncheckedIOException; import java.nio.ByteBuffer; diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystemFactory.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystemFactory.java index aff01b82c..fad864529 100644 --- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystemFactory.java +++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFileSystemFactory.java @@ -19,7 +19,6 @@ import org.cryptomator.crypto.engine.Cryptor; import org.cryptomator.crypto.engine.InvalidPassphraseException; import org.cryptomator.filesystem.FileSystem; import org.cryptomator.filesystem.Folder; -import org.cryptomator.filesystem.blockaligned.BlockAlignedFileSystemFactory; @Singleton public class CryptoFileSystemFactory { diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/blockaligned/BlockAlignedReadableFileTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFileTest.java similarity index 96% rename from main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/blockaligned/BlockAlignedReadableFileTest.java rename to main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFileTest.java index 779124649..5dba87c4d 100644 --- a/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/blockaligned/BlockAlignedReadableFileTest.java +++ b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFileTest.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.filesystem.blockaligned; +package org.cryptomator.filesystem.crypto; import java.nio.ByteBuffer; @@ -15,6 +15,7 @@ import org.cryptomator.filesystem.File; import org.cryptomator.filesystem.FileSystem; import org.cryptomator.filesystem.ReadableFile; import org.cryptomator.filesystem.WritableFile; +import org.cryptomator.filesystem.crypto.BlockAlignedReadableFile; import org.cryptomator.filesystem.inmem.InMemoryFileSystem; import org.junit.Assert; import org.junit.Test; diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/blockaligned/BlockAlignedWritableFileTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/BlockAlignedWritableFileTest.java similarity index 95% rename from main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/blockaligned/BlockAlignedWritableFileTest.java rename to main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/BlockAlignedWritableFileTest.java index a8b99c1d9..66e70eab0 100644 --- a/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/blockaligned/BlockAlignedWritableFileTest.java +++ b/main/filesystem-crypto/src/test/java/org/cryptomator/filesystem/crypto/BlockAlignedWritableFileTest.java @@ -6,7 +6,7 @@ * Contributors: * Sebastian Stenzel - initial API and implementation *******************************************************************************/ -package org.cryptomator.filesystem.blockaligned; +package org.cryptomator.filesystem.crypto; import java.nio.ByteBuffer; @@ -14,6 +14,7 @@ import org.cryptomator.filesystem.File; import org.cryptomator.filesystem.FileSystem; import org.cryptomator.filesystem.ReadableFile; import org.cryptomator.filesystem.WritableFile; +import org.cryptomator.filesystem.crypto.BlockAlignedWritableFile; import org.cryptomator.filesystem.inmem.InMemoryFileSystem; import org.junit.Assert; import org.junit.Test;