Skip to content

Commit 8085cff

Browse files
committed
Add writer as parameter to allow wrapping with encryption feature.
1 parent 69795a6 commit 8085cff

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

owncloud/src/main/java/ch/cyberduck/core/owncloud/OwncloudSession.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public <T> T _getFeature(final Class<T> type) {
141141
return (T) new DAVDirectoryFeature(this, new OwncloudAttributesFinderFeature(this));
142142
}
143143
if(type == Touch.class) {
144-
return (T) new DAVTouchFeature(new NextcloudWriteFeature(this));
144+
return (T) new DAVTouchFeature(this);
145145
}
146146
if(type == AttributesFinder.class) {
147147
return (T) new OwncloudAttributesFinderFeature(this);

owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import ch.cyberduck.core.io.BandwidthThrottle;
3737
import ch.cyberduck.core.io.HashAlgorithm;
3838
import ch.cyberduck.core.io.StreamCopier;
39+
import ch.cyberduck.core.nextcloud.NextcloudWriteFeature;
3940
import ch.cyberduck.core.owncloud.AbstractOcisTest;
4041
import ch.cyberduck.core.owncloud.OcisUploadFeature;
4142
import ch.cyberduck.core.owncloud.OwncloudAttributesFinderFeature;
@@ -72,7 +73,7 @@ public class OcisUploadFeatureTest extends AbstractOcisTest {
7273
@Test
7374
public void testUploadVault() throws Exception {
7475
// 5L * 1024L * 1024L
75-
final Path directory = new DAVDirectoryFeature(session).mkdir(new Path(new OwncloudHomeFeature(session.getHost()).find(),
76+
final Path directory = new DAVDirectoryFeature(session).mkdir(new NextcloudWriteFeature(session), new Path(new OwncloudHomeFeature(session.getHost()).find(),
7677
new AlphanumericRandomStringService().random(), EnumSet.of(AbstractPath.Type.directory)), new TransferStatus());
7778
final CryptoVault cryptomator = new CryptoVault(
7879
new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)));

owncloud/src/test/java/ch/cyberduck/core/owncloud/OcisUploadFeatureTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import ch.cyberduck.core.io.BandwidthThrottle;
3434
import ch.cyberduck.core.io.HashAlgorithm;
3535
import ch.cyberduck.core.io.SHA1ChecksumCompute;
36+
import ch.cyberduck.core.nextcloud.NextcloudWriteFeature;
3637
import ch.cyberduck.core.transfer.TransferStatus;
3738
import ch.cyberduck.core.tus.TusCapabilities;
3839
import ch.cyberduck.core.tus.TusWriteFeature;
@@ -59,7 +60,7 @@ public void testUploadLargeFileInChunks() throws Exception {
5960
.withExtension(TusCapabilities.Extension.checksum)
6061
.withExtension(TusCapabilities.Extension.creation);
6162
final OcisUploadFeature feature = new OcisUploadFeature(session, capabilities);
62-
final Path directory = new DAVDirectoryFeature(session).mkdir(new Path(new OwncloudHomeFeature(session.getHost()).find(),
63+
final Path directory = new DAVDirectoryFeature(session).mkdir(new NextcloudWriteFeature(session), new Path(new OwncloudHomeFeature(session.getHost()).find(),
6364
new AlphanumericRandomStringService().random(), EnumSet.of(AbstractPath.Type.directory)), new TransferStatus());
6465
final String name = new AlphanumericRandomStringService().random();
6566
final Path file = new Path(directory, name, EnumSet.of(Path.Type.file));

owncloud/src/test/java/ch/cyberduck/core/owncloud/OwncloudVersioningFeatureTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public class OwncloudVersioningFeatureTest extends AbstractOwncloudTest {
4949

5050
@Test
5151
public void testRevert() throws Exception {
52-
final Path directory = new DAVDirectoryFeature(session).mkdir(new Path(
52+
final NextcloudWriteFeature writer = new NextcloudWriteFeature(session);
53+
final Path directory = new DAVDirectoryFeature(session).mkdir(writer, new Path(
5354
new OwncloudHomeFeature(session.getHost()).find(),
5455
new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus());
5556
final Path test = new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
5657
final TransferStatus status = new TransferStatus();
57-
final NextcloudWriteFeature writer = new NextcloudWriteFeature(session);
5858
final byte[] initialContent = RandomUtils.nextBytes(32769);
5959
{
6060
new StreamCopier(status, status).transfer(new ByteArrayInputStream(initialContent), writer.write(test, status.setLength(initialContent.length), new DisabledConnectionCallback()));

0 commit comments

Comments
 (0)