Add writer as parameter to allow wrapping with encryption feature.

Author: dkocher

nextcloud/src/main/java/ch/cyberduck/core/nextcloud/NextcloudSession.java

@@ -99,7 +99,7 @@ public <T> T _getFeature(final Class<T> type) {
             return (T) new DAVDirectoryFeature(this, new NextcloudAttributesFinderFeature(this));
         }
         if(type == Touch.class) {
-            return (T) new DAVTouchFeature(new NextcloudWriteFeature(this));
+            return (T) new DAVTouchFeature(this);
         }
         if(type == AttributesFinder.class) {
             return (T) new NextcloudAttributesFinderFeature(this);

nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudAttributesFinderFeatureTest.java

@@ -67,7 +67,7 @@ public void testFindNotFound() throws Exception {
     @Test
     public void testFindFile() throws Exception {
         final Checksum checksum = ChecksumComputeFactory.get(HashAlgorithm.sha1).compute(new NullInputStream(0L), new TransferStatus());
-        final Path test = new DAVTouchFeature(new NextcloudWriteFeature(session)).touch(new Path(new DefaultHomeFinderService(session).find(),
+        final Path test = new DAVTouchFeature(session).touch(new NextcloudWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(),
                 new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus().setChecksum(checksum));
         final NextcloudAttributesFinderFeature f = new NextcloudAttributesFinderFeature(session);
         final PathAttributes attributes = f.find(test);
@@ -95,7 +95,7 @@ public void testFindFile() throws Exception {
     public void testFindDirectory() throws Exception {
         final Path home = new DefaultHomeFinderService(session).find();
         final Path directory = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(
-                new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
+                new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
         final NextcloudAttributesFinderFeature f = new NextcloudAttributesFinderFeature(session);
         final PathAttributes attributes = f.find(directory);
         assertNotNull(attributes.getFileId());
@@ -189,7 +189,7 @@ public void testCustomModified_Epoch() {
 
     @Test
     public void testFindLock() throws Exception {
-        final Path test = new DAVTouchFeature(new NextcloudWriteFeature(session)).touch(new Path(new DefaultHomeFinderService(session).find(),
+        final Path test = new DAVTouchFeature(session).touch(new NextcloudWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(),
                 new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
         final NextcloudAttributesFinderFeature f = new NextcloudAttributesFinderFeature(session);
         assertNull(f.find(test).getLockId());

nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudListServiceTest.java

@@ -56,7 +56,7 @@ public void testListNotfound() throws Exception {
 
     @Test(expected = NotfoundException.class)
     public void testListFileException() throws Exception {
-        final Path test = new DAVTouchFeature(new NextcloudWriteFeature(session)).touch(new Path(new DefaultHomeFinderService(session).find(),
+        final Path test = new DAVTouchFeature(session).touch(new NextcloudWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(),
                 new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
         try {
             final AttributedList<Path> list = new NextcloudListService(session).list(new Path(test.getAbsolute(), EnumSet.of(Path.Type.directory, Path.Type.volume)),
@@ -70,12 +70,12 @@ public void testListFileException() throws Exception {
     @Test
     public void testList() throws Exception {
         final Path home = new DefaultHomeFinderService(session).find();
-        final Path directory = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
+        final Path directory = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
         final PathAttributes directoryAttributes = new DAVAttributesFinderFeature(session).find(directory);
         final String folderEtag = directoryAttributes.getETag();
         final long folderTimestamp = directoryAttributes.getModificationDate();
         Thread.sleep(1000L);
-        final Path test = new DAVTouchFeature(new NextcloudWriteFeature(session)).touch(new Path(directory,
+        final Path test = new DAVTouchFeature(session).touch(new NextcloudWriteFeature(session), new Path(directory,
                 new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
         assertEquals(Protocol.DirectoryTimestamp.implicit, session.getHost().getProtocol().getDirectoryTimestamp());
         assertNotEquals(folderTimestamp, new DAVAttributesFinderFeature(session).find(directory).getModificationDate());

nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudShareFeatureTest.java

@@ -54,7 +54,7 @@ public void testIsSupported() throws Exception {
     @Test
     public void testToDownloadUrlNoPassword() throws Exception {
         final Path home = new NextcloudHomeFeature(session.getHost()).find();
-        final Path file = new DAVTouchFeature(new NextcloudWriteFeature(session)).touch(new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
+        final Path file = new DAVTouchFeature(session).touch(new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
         final DescriptiveUrl url = new NextcloudShareFeature(session).toDownloadUrl(file, Share.Sharee.world, null, new DisabledPasswordCallback());
         assertNotSame(DescriptiveUrl.EMPTY, url);
         new DAVDeleteFeature(session).delete(Collections.singletonList(file), new DisabledPasswordCallback(), new Delete.DisabledCallback());
@@ -63,7 +63,7 @@ public void testToDownloadUrlNoPassword() throws Exception {
     @Test
     public void testToDownloadUrlSharee() throws Exception {
         final Path home = new NextcloudHomeFeature(session.getHost()).find();
-        final Path file = new DAVTouchFeature(new NextcloudWriteFeature(session)).touch(new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
+        final Path file = new DAVTouchFeature(session).touch(new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
         final NextcloudShareFeature provider = new NextcloudShareFeature(session);
         final Set<Share.Sharee> sharees = provider.getSharees(Share.Type.download);
         assertFalse(sharees.isEmpty());
@@ -80,7 +80,7 @@ public void testToDownloadUrlSharee() throws Exception {
     @Test
     public void testToUploadUrlNoPassword() throws Exception {
         final Path home = new NextcloudHomeFeature(session.getHost()).find();
-        final Path folder = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
+        final Path folder = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
         final DescriptiveUrl url = new NextcloudShareFeature(session).toUploadUrl(folder, Share.Sharee.world, null, new DisabledPasswordCallback());
         assertNotSame(DescriptiveUrl.EMPTY, url);
         new DAVDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledPasswordCallback(), new Delete.DisabledCallback());
@@ -89,7 +89,7 @@ public void testToUploadUrlNoPassword() throws Exception {
     @Test
     public void testToDownloadUrlPasswordTooShort() throws Exception {
         final Path home = new NextcloudHomeFeature(session.getHost()).find();
-        final Path folder = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
+        final Path folder = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
         try {
             new NextcloudShareFeature(session).toDownloadUrl(folder, Share.Sharee.world, null, new DisabledPasswordCallback() {
                 @Override
@@ -108,7 +108,7 @@ public Credentials prompt(final Host bookmark, final String title, final String
     @Test
     public void testToDownloadUrlPassword() throws Exception {
         final Path home = new NextcloudHomeFeature(session.getHost()).find();
-        final Path file = new DAVTouchFeature(new NextcloudWriteFeature(session)).touch(new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
+        final Path file = new DAVTouchFeature(session).touch(new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
         final DescriptiveUrl url = new NextcloudShareFeature(session).toDownloadUrl(file, Share.Sharee.world, null, new DisabledPasswordCallback() {
             @Override
             public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) {
@@ -146,7 +146,7 @@ public Credentials prompt(final Host bookmark, final String title, final String
     @Test
     public void testToUploadUrl() throws Exception {
         final Path home = new NextcloudHomeFeature(session.getHost()).find();
-        final Path folder = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
+        final Path folder = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
         final DescriptiveUrl url = new NextcloudShareFeature(session).toUploadUrl(folder, Share.Sharee.world, null, new DisabledPasswordCallback() {
             @Override
             public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) {
@@ -160,7 +160,7 @@ public Credentials prompt(final Host bookmark, final String title, final String
     @Test
     public void testToUploadUrlPasswordTooShort() throws Exception {
         final Path home = new NextcloudHomeFeature(session.getHost()).find();
-        final Path folder = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
+        final Path folder = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new NextcloudWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
         try {
             new NextcloudShareFeature(session).toUploadUrl(folder, Share.Sharee.world, null, new DisabledPasswordCallback() {
                 @Override

nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudVersioningFeatureTest.java

@@ -47,7 +47,7 @@ public class NextcloudVersioningFeatureTest extends AbstractNextcloudTest {
 
     @Test
     public void testRevert() throws Exception {
-        final Path directory = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new Path(new DefaultHomeFinderService(session).find(),
+        final Path directory = new DAVDirectoryFeature(session, new NextcloudAttributesFinderFeature(session)).mkdir(new NextcloudWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(),
                 new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus());
         final Path test = new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
         final TransferStatus status = new TransferStatus();