diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AbstractAzureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AbstractAzureTest.java index d6573645ad..edcbb2f4ed 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AbstractAzureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AbstractAzureTest.java @@ -15,8 +15,8 @@ package ch.cyberduck.core.azure;/* import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.cryptomator.CryptoVault; @@ -50,7 +50,7 @@ public class AbstractAzureTest extends VaultTest { PROPERTIES.get("azure.user") )); session = new AzureSession(host); - new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new TestPasswordStore(), ProgressListener.noop).check(session, CancelCallback.noop); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureAttributesFinderFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureAttributesFinderFeatureTest.java index fc4e7f6dd1..4a91024f84 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureAttributesFinderFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureAttributesFinderFeatureTest.java @@ -4,7 +4,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -52,7 +52,7 @@ public class AzureAttributesFinderFeatureTest extends AbstractAzureTest { assertEquals("d41d8cd98f00b204e9800998ecf8427e", attributes.getChecksum().hash); assertNotNull(attributes.getETag()); assertEquals(attributes.getETag(), new DefaultAttributesFinderFeature(session).find(test).getETag()); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -64,7 +64,7 @@ public class AzureAttributesFinderFeatureTest extends AbstractAzureTest { assertNotEquals(PathAttributes.EMPTY, attributes); assertNotNull(attributes.getETag()); assertEquals(attributes.getETag(), new DefaultAttributesFinderFeature(session).find(container).getETag()); - new AzureDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -82,7 +82,7 @@ public class AzureAttributesFinderFeatureTest extends AbstractAzureTest { assertNotEquals(PathAttributes.EMPTY, attributes); assertNotNull(attributes.getETag()); assertNotNull(new AzureObjectListService(session).list(directory, new DisabledListProgressListener()).find(new DefaultPathPredicate(test))); - new AzureDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertNotNull(new AzureObjectListService(session).list(directory, new DisabledListProgressListener()).find(new DefaultPathPredicate(test))); // Still found as prefix assertNotNull(new AzureObjectListService(session).list(container, new DisabledListProgressListener()).find(new DefaultPathPredicate(intermediate))); @@ -90,7 +90,7 @@ public class AzureAttributesFinderFeatureTest extends AbstractAzureTest { // Ignore 404 failures assertSame(PathAttributes.EMPTY, new AzureAttributesFinderFeature(session).find(directory)); assertSame(PathAttributes.EMPTY, new AzureAttributesFinderFeature(session).find(intermediate)); - new AzureDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new AzureDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureCopyFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureCopyFeatureTest.java index acf6158660..5e2a23ddba 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureCopyFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureCopyFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.UnsupportedException; @@ -51,7 +51,7 @@ public class AzureCopyFeatureTest extends AbstractAzureTest { final PathAttributes sourceAttr = new AzureAttributesFinderFeature(session).find(test); final PathAttributes copyAttr = new AzureAttributesFinderFeature(session).find(copy); assertNotEquals(sourceAttr.getETag(), copyAttr.getETag()); - new AzureDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -71,6 +71,6 @@ public class AzureCopyFeatureTest extends AbstractAzureTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new AzureDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureDeleteFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureDeleteFeatureTest.java index cc54d1dc93..e3e3e97f88 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureDeleteFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureDeleteFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -25,14 +25,14 @@ public class AzureDeleteFeatureTest extends AbstractAzureTest { @Test(expected = NotfoundException.class) public void testDeleteNotFoundBucket() throws Exception { final Path container = new Path(new AsciiRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)); - new AzureDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) public void testDeleteNotFoundKey() throws Exception { final Path container = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -40,7 +40,7 @@ public class AzureDeleteFeatureTest extends AbstractAzureTest { final Path container = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path test = new AzureDirectoryFeature(session).mkdir(new AzureWriteFeature(session), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new AzureFindFeature(session).find(test)); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new AzureFindFeature(session).find(test)); } @@ -51,7 +51,7 @@ public class AzureDeleteFeatureTest extends AbstractAzureTest { final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new AzureTouchFeature(session).touch(new AzureWriteFeature(session), test, new TransferStatus()); assertTrue(new AzureFindFeature(session).find(test)); - new AzureDeleteFeature(session).delete(Arrays.asList(container, test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Arrays.asList(container, test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new AzureFindFeature(session).find(test)); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureDirectoryFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureDirectoryFeatureTest.java index 6012559a95..5cf1f1d3fb 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureDirectoryFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureDirectoryFeatureTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.ConflictException; @@ -30,7 +30,7 @@ public class AzureDirectoryFeatureTest extends AbstractAzureTest { assertEquals(PathAttributes.EMPTY, container.attributes()); assertThrows(ConflictException.class, () -> feature.mkdir(new AzureWriteFeature(session), container, new TransferStatus())); new AzureTouchFeature(session).touch(new AzureWriteFeature(session), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); - new AzureDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new AzureFindFeature(session).find(container)); } @@ -42,7 +42,7 @@ public class AzureDirectoryFeatureTest extends AbstractAzureTest { assertThrows(InvalidFilenameException.class, () -> feature.preflight(container.getParent(), container.getName())); feature.mkdir(new AzureWriteFeature(session), container, new TransferStatus()); assertTrue(new AzureFindFeature(session).find(container)); - new AzureDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new AzureFindFeature(session).find(container)); } @@ -56,10 +56,10 @@ public class AzureDirectoryFeatureTest extends AbstractAzureTest { assertEquals(PathAttributes.EMPTY, placeholder.attributes()); final Path file = new Path(placeholder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new AzureTouchFeature(session).touch(new AzureWriteFeature(session), file, new TransferStatus()); - new AzureDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); // Still find common prefix assertTrue(new AzureFindFeature(session).find(placeholder)); assertEquals(PathAttributes.EMPTY, new AzureAttributesFinderFeature(session).find(placeholder)); - new AzureDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureFindFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureFindFeatureTest.java index 00689d7497..9bc5315fc6 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureFindFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureFindFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.CachingFindFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.features.Delete; @@ -57,7 +57,7 @@ public class AzureFindFeatureTest extends AbstractAzureTest { new AzureWriteFeature(session), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new AzureFindFeature(session).find(folder)); assertFalse(new AzureFindFeature(session).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new AzureDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -67,7 +67,7 @@ public class AzureFindFeatureTest extends AbstractAzureTest { new AzureTouchFeature(session).touch(new AzureWriteFeature(session), file, new TransferStatus()); assertTrue(new AzureFindFeature(session).find(file)); assertFalse(new AzureFindFeature(session).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new AzureDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -84,7 +84,7 @@ public class AzureFindFeatureTest extends AbstractAzureTest { assertTrue(new AzureFindFeature(session).find(new Path(container, prefix, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); assertTrue(new AzureObjectListService(session).list(intermediate, new DisabledListProgressListener()).contains(test)); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new AzureFindFeature(session).find(test)); assertFalse(new AzureFindFeature(session).find(intermediate)); final PathCache cache = new PathCache(1); diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureMetadataFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureMetadataFeatureTest.java index 5dbf88b37f..edaef2c2cf 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureMetadataFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureMetadataFeatureTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -30,7 +30,7 @@ public class AzureMetadataFeatureTest extends AbstractAzureTest { assertFalse(metadata.isEmpty()); assertTrue(metadata.containsKey("Test")); assertEquals(v, metadata.get("Test")); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -44,6 +44,6 @@ public class AzureMetadataFeatureTest extends AbstractAzureTest { assertFalse(metadata.isEmpty()); assertTrue(metadata.containsKey("Cache-Control")); assertEquals("public, max-age=0", metadata.get("Cache-Control")); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureMoveFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureMoveFeatureTest.java index de4ea364ef..ef5c9f1622 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureMoveFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureMoveFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -34,7 +34,7 @@ public class AzureMoveFeatureTest extends AbstractAzureTest { assertTrue(new AzureFindFeature(session).find(target)); final PathAttributes targetAttr = new AzureAttributesFinderFeature(session).find(target); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, sourceAttr, targetAttr)); - new AzureDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureObjectListServiceTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureObjectListServiceTest.java index 7451fbe504..d621cca10e 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureObjectListServiceTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureObjectListServiceTest.java @@ -3,8 +3,8 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.IndexedListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -46,7 +46,7 @@ public class AzureObjectListServiceTest extends AbstractAzureTest { } }).isEmpty()); assertTrue(callback.get()); - new AzureDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -69,7 +69,7 @@ public class AzureObjectListServiceTest extends AbstractAzureTest { final PathAttributes attributes = list.get(0).attributes(); assertEquals(attributes, new AzureAttributesFinderFeature(session).find(file)); assertSame(directory, list.get(0).getParent()); - new AzureDeleteFeature(session).delete(Arrays.asList(file, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Arrays.asList(file, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -98,8 +98,8 @@ public class AzureObjectListServiceTest extends AbstractAzureTest { }); for(int i = 0; i < list.size(); i++) { assertEquals(files.get(i), list.get(i).getName()); - new AzureDeleteFeature(session).delete(Collections.singletonList(list.get(i)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(list.get(i)), LoginCallback.noop, new Delete.DisabledCallback()); } - new AzureDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureReadFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureReadFeatureTest.java index a940c4d80b..3b9de6eb80 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureReadFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureReadFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -44,7 +44,7 @@ public class AzureReadFeatureTest extends AbstractAzureTest { final InputStream in = new AzureReadFeature(session).read(test, new TransferStatus().setLength(0L), ConnectionCallback.noop); assertNotNull(in); in.close(); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -70,6 +70,6 @@ public class AzureReadFeatureTest extends AbstractAzureTest { in.close(); // Test double close in.close(); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureTouchFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureTouchFeatureTest.java index 7513cd1fa4..7258582352 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureTouchFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureTouchFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -37,7 +37,7 @@ public class AzureTouchFeatureTest extends AbstractAzureTest { final Path container = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path test = new Path(container, String.format(".%s.", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)); new AzureTouchFeature(session).touch(new AzureWriteFeature(session), test, new TransferStatus()); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureUrlProviderTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureUrlProviderTest.java index 2bf7e91215..4788dd70c8 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureUrlProviderTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureUrlProviderTest.java @@ -3,7 +3,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DescriptiveUrl; import ch.cyberduck.core.DescriptiveUrlBag; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -31,6 +31,6 @@ public class AzureUrlProviderTest extends AbstractAzureTest { for(DescriptiveUrl url : urls) { assertFalse(url.getUrl().isEmpty()); } - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AzureWriteFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AzureWriteFeatureTest.java index 6e73e93d49..507e63545b 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AzureWriteFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AzureWriteFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.azure; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -65,7 +65,7 @@ public class AzureWriteFeatureTest extends AbstractAzureTest { // Test double close overwrite.close(); assertEquals("overwrite".getBytes(StandardCharsets.UTF_8).length, new AzureAttributesFinderFeature(session).find(test).getSize()); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -100,6 +100,6 @@ public class AzureWriteFeatureTest extends AbstractAzureTest { // Test double close overwrite.close(); assertEquals("overwrite".getBytes(StandardCharsets.UTF_8).length, new AzureAttributesFinderFeature(session).find(test).getSize()); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureDirectoryFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureDirectoryFeatureTest.java index 37fabc7427..cd3fb7edd2 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureDirectoryFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureDirectoryFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.azure.AbstractAzureTest; import ch.cyberduck.core.azure.AzureDeleteFeature; @@ -59,7 +59,7 @@ public class AzureDirectoryFeatureTest extends AbstractAzureTest { cryptomator.getFeature(session, Write.class, new AzureWriteFeature(session)), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(test.getType().contains(Path.Type.decrypted)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -73,6 +73,6 @@ public class AzureDirectoryFeatureTest extends AbstractAzureTest { final Path test = cryptomator.getFeature(session, Directory.class, new AzureDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new AzureWriteFeature(session)), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureListServiceTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureListServiceTest.java index 174e34b260..de12c0731e 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureListServiceTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureListServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.azure.AbstractAzureTest; import ch.cyberduck.core.azure.AzureDeleteFeature; @@ -61,6 +61,6 @@ public class AzureListServiceTest extends AbstractAzureTest { new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( new CryptoWriteFeature<>(session, new AzureWriteFeature(session), cryptomator), test, new TransferStatus()); assertEquals(test, new CryptoListService(session, new AzureObjectListService(session), cryptomator).list(vault, new DisabledListProgressListener()).get(0)); - cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureMoveFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureMoveFeatureTest.java index 8e5bd2dbe8..055f301646 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureMoveFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureMoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.azure.AbstractAzureTest; import ch.cyberduck.core.azure.AzureDeleteFeature; @@ -81,6 +81,6 @@ public class AzureMoveFeatureTest extends AbstractAzureTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new AzureFindFeature(session)).find(fileRenamedInRenamedFolder)); cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList( - fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureTouchFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureTouchFeatureTest.java index b8a257cd4d..73ea85e76e 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureTouchFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureTouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.azure.AbstractAzureTest; import ch.cyberduck.core.azure.AzureDeleteFeature; @@ -64,7 +64,7 @@ public class AzureTouchFeatureTest extends AbstractAzureTest { assertEquals(TransferStatus.UNKNOWN_LENGTH, test.attributes().getSize()); assertEquals(TransferStatus.UNKNOWN_LENGTH, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new AzureFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -81,6 +81,6 @@ public class AzureTouchFeatureTest extends AbstractAzureTest { assertEquals(TransferStatus.UNKNOWN_LENGTH, test.attributes().getSize()); assertEquals(TransferStatus.UNKNOWN_LENGTH, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureWriteFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureWriteFeatureTest.java index 64f9bb2682..131c052340 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureWriteFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.azure.AbstractAzureTest; @@ -87,6 +87,6 @@ public class AzureWriteFeatureTest extends AbstractAzureTest { final InputStream in = new CryptoReadFeature(session, new AzureReadFeature(session), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 9300323bdd..70d3cbd32a 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -92,7 +92,7 @@ public class CopyWorkerTest extends AbstractAzureTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new AzureReadFeature(session), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -117,7 +117,7 @@ public class CopyWorkerTest extends AbstractAzureTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -141,7 +141,7 @@ public class CopyWorkerTest extends AbstractAzureTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -172,7 +172,7 @@ public class CopyWorkerTest extends AbstractAzureTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -201,7 +201,7 @@ public class CopyWorkerTest extends AbstractAzureTest { assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new AzureReadFeature(session), cryptomator).read(encryptedFile, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -228,7 +228,7 @@ public class CopyWorkerTest extends AbstractAzureTest { assertTrue(new AzureFindFeature(session).find(cleartextFolder)); assertTrue(new AzureFindFeature(session).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -256,7 +256,7 @@ public class CopyWorkerTest extends AbstractAzureTest { assertTrue(cryptomator.getFeature(session, Find.class, new AzureFindFeature(session)).find(encryptedFile)); assertTrue(new AzureFindFeature(session).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); } @Test @@ -285,6 +285,6 @@ public class CopyWorkerTest extends AbstractAzureTest { final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new AzureFindFeature(session).find(fileRenamed)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); } } diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/CryptoAzureSingleTransferWorkerTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/CryptoAzureSingleTransferWorkerTest.java index 082e488918..063c58c18a 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/CryptoAzureSingleTransferWorkerTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/CryptoAzureSingleTransferWorkerTest.java @@ -17,10 +17,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -100,7 +100,7 @@ public class CryptoAzureSingleTransferWorkerTest extends AbstractAzureTest { public TransferAction prompt(final TransferItem file) { return TransferAction.overwrite; } - }, new DisabledTransferErrorCallback(), ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()).run(session)); + }, new DisabledTransferErrorCallback(), ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()).run(session)); assertTrue(cryptomator.getFeature(session, Find.class, new AzureFindFeature(session)).find(dir1)); assertEquals(content.length, cryptomator.getFeature(session, AttributesFinder.class, new AzureAttributesFinderFeature(session)).find(file1).getSize()); { @@ -116,7 +116,7 @@ public class CryptoAzureSingleTransferWorkerTest extends AbstractAzureTest { new StreamCopier(StreamCancelation.noop, StreamProgress.noop).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new AzureDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/azure/src/test/java/ch/cyberduck/core/worker/AzureSingleTransferWorkerTest.java b/azure/src/test/java/ch/cyberduck/core/worker/AzureSingleTransferWorkerTest.java index ed1f1198b6..6a3958f23a 100644 --- a/azure/src/test/java/ch/cyberduck/core/worker/AzureSingleTransferWorkerTest.java +++ b/azure/src/test/java/ch/cyberduck/core/worker/AzureSingleTransferWorkerTest.java @@ -17,9 +17,9 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -84,9 +84,9 @@ public class AzureSingleTransferWorkerTest extends AbstractAzureTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()).run(session)); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()).run(session)); assertArrayEquals(content, IOUtils.toByteArray(localFile.getInputStream())); - new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new AzureDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); localFile.delete(); } } diff --git a/azure/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java b/azure/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java index cc06c3a5a0..bed5cdff0c 100644 --- a/azure/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java +++ b/azure/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -53,7 +53,7 @@ public class CopyWorkerTest extends AbstractAzureTest { worker.run(session); assertTrue(new AzureFindFeature(session).find(source)); assertTrue(new AzureFindFeature(session).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(source, target), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(source, target), ProgressListener.noop).run(session); } @Test @@ -71,7 +71,7 @@ public class CopyWorkerTest extends AbstractAzureTest { worker.run(session); assertTrue(new AzureFindFeature(session).find(sourceFile)); assertTrue(new AzureFindFeature(session).find(targetFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); } @Test @@ -92,6 +92,6 @@ public class CopyWorkerTest extends AbstractAzureTest { assertTrue(new AzureFindFeature(session).find(targetFile)); assertTrue(new AzureFindFeature(session).find(folder)); assertTrue(new AzureFindFeature(session).find(sourceFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(folder, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(folder, targetFolder), ProgressListener.noop).run(session); } } diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2VersioningFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2VersioningFeature.java index 4fb5a75407..fd1f18f851 100644 --- a/backblaze/src/main/java/ch/cyberduck/core/b2/B2VersioningFeature.java +++ b/backblaze/src/main/java/ch/cyberduck/core/b2/B2VersioningFeature.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.b2; */ import ch.cyberduck.core.AttributedList; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.PasswordCallback; import ch.cyberduck.core.Path; @@ -61,7 +61,7 @@ public class B2VersioningFeature implements Versioning { @Override public void revert(final Path file) throws BackgroundException { - new B2CopyFeature(session, fileid).copy(file, file, new TransferStatus(), new DisabledLoginCallback(), StreamListener.noop); + new B2CopyFeature(session, fileid).copy(file, file, new TransferStatus(), LoginCallback.noop, StreamListener.noop); } @Override diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2AttributesFinderFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2AttributesFinderFeatureTest.java index b6d72d4337..2ef2b279cd 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2AttributesFinderFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2AttributesFinderFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -63,7 +63,7 @@ public class B2AttributesFinderFeatureTest extends AbstractB2Test { assertNotNull(attributes.getVersionId()); assertNull(attributes.getFileId()); assertNotEquals(Checksum.NONE, attributes.getChecksum()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -76,7 +76,7 @@ public class B2AttributesFinderFeatureTest extends AbstractB2Test { final Path test = new B2TouchFeature(session, fileid).touch(new B2WriteFeature(session, fileid), new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), status); assertNotNull(status.getResponse().getVersionId()); assertNotNull(test.attributes().getVersionId()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(test).withAttributes(PathAttributes.EMPTY)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(test).withAttributes(PathAttributes.EMPTY)), LoginCallback.noop, new Delete.DisabledCallback()); final B2AttributesFinderFeature f = new B2AttributesFinderFeature(session, fileid); assertEquals(test.attributes(), f.find(test)); try { @@ -86,8 +86,8 @@ public class B2AttributesFinderFeatureTest extends AbstractB2Test { catch(NotfoundException e) { // Expected } - new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(directory, new DisabledListProgressListener()).toList(), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(directory, new DisabledListProgressListener()).toList(), LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -107,7 +107,7 @@ public class B2AttributesFinderFeatureTest extends AbstractB2Test { catch(NotfoundException e) { // Expected } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -119,7 +119,7 @@ public class B2AttributesFinderFeatureTest extends AbstractB2Test { assertNotNull(attributes); assertNotEquals(PathAttributes.EMPTY, attributes); assertEquals(bucket.attributes().getVersionId(), attributes.getVersionId()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -155,7 +155,7 @@ public class B2AttributesFinderFeatureTest extends AbstractB2Test { fileid.cache(test, invalidId); final B2AttributesFinderFeature f = new B2AttributesFinderFeature(session, fileid); assertEquals(latestnodeid, f.find(test).getVersionId()); - new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).toList(), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).toList(), LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2AuthorizedUrlProviderTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2AuthorizedUrlProviderTest.java index ba66da23d9..48dc9189fd 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2AuthorizedUrlProviderTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2AuthorizedUrlProviderTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DescriptiveUrl; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Share; @@ -47,6 +47,6 @@ public class B2AuthorizedUrlProviderTest extends AbstractB2Test { final DescriptiveUrl url = provider.toDownloadUrl(test, Share.Sharee.world, null, new DisabledPasswordCallback()); assertNotEquals(DescriptiveUrl.EMPTY, url); assertNotNull(url.getUrl()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2BucketTypeFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2BucketTypeFeatureTest.java index 391b60f5c8..b8b8e06739 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2BucketTypeFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2BucketTypeFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.b2; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -39,7 +39,7 @@ public class B2BucketTypeFeatureTest extends AbstractB2Test { final Path bucket = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); assertEquals("allPrivate", new B2BucketTypeFeature(session, fileid).getLocation(bucket).getIdentifier()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -48,6 +48,6 @@ public class B2BucketTypeFeatureTest extends AbstractB2Test { final Path bucket = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus().setRegion("allPublic")); assertEquals("allPublic", new B2BucketTypeFeature(session, fileid).getLocation(bucket).getIdentifier()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2CopyFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2CopyFeatureTest.java index 72ec9c8bd4..941fb7c4f1 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2CopyFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2CopyFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.UnsupportedException; import ch.cyberduck.core.features.Delete; @@ -59,7 +59,7 @@ public class B2CopyFeatureTest extends AbstractB2Test { assertNotEquals(test.attributes().getVersionId(), copy.attributes().getVersionId()); assertTrue(new B2FindFeature(session, fileid).find(new Path(container, name, EnumSet.of(Path.Type.file)))); assertTrue(new B2FindFeature(session, fileid).find(copy)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -74,7 +74,7 @@ public class B2CopyFeatureTest extends AbstractB2Test { final Path copy = new B2CopyFeature(session, fileid).copy(test, new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new B2FindFeature(session, fileid).find(new Path(container, name, EnumSet.of(Path.Type.file)))); assertTrue(new B2FindFeature(session, fileid).find(copy)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy, target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy, target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,6 +91,6 @@ public class B2CopyFeatureTest extends AbstractB2Test { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2DeleteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2DeleteFeatureTest.java index ef70e9ec5a..6d7f7e5606 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2DeleteFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2DeleteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -42,7 +42,7 @@ public class B2DeleteFeatureTest extends AbstractB2Test { public void testDeleteNotFound() throws Exception { final Path bucket = new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path test = new Path(bucket, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new B2DeleteFeature(session, new B2VersionIdProvider(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, new B2VersionIdProvider(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -56,12 +56,12 @@ public class B2DeleteFeatureTest extends AbstractB2Test { assertNotNull(versionId); // Hide new B2DeleteFeature(session, new B2VersionIdProvider(session)).delete(Collections.singletonList(test.withAttributes(PathAttributes.EMPTY)), - new DisabledLoginCallback(), new Delete.DisabledCallback()); + LoginCallback.noop, new Delete.DisabledCallback()); // Double hide. Ignore failure already_hidden new B2DeleteFeature(session, new B2VersionIdProvider(session)).delete(Collections.singletonList(test.withAttributes(PathAttributes.EMPTY)), - new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).toList(), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, new B2VersionIdProvider(session)).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).toList(), LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, new B2VersionIdProvider(session)).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -70,7 +70,7 @@ public class B2DeleteFeatureTest extends AbstractB2Test { final Path bucket = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); final Path file = new Path(bucket, String.format("%s %s", new AlphanumericRandomStringService().random(), "1"), EnumSet.of(Path.Type.file)); new B2TouchFeature(session, fileid).touch(new B2WriteFeature(session, fileid), file, new TransferStatus()); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(bucket, file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(bucket, file), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new B2FindFeature(session, fileid).find(file)); assertFalse(new B2FindFeature(session, fileid).find(bucket)); } @@ -81,16 +81,16 @@ public class B2DeleteFeatureTest extends AbstractB2Test { final Path bucket = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); final Path file = new Path(bucket, String.format("%s %s", new AlphanumericRandomStringService().random(), "1"), EnumSet.of(Path.Type.file)); new B2TouchFeature(session, fileid).touch(new B2WriteFeature(session, fileid), file, new TransferStatus()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new B2FindFeature(session, fileid).find(file)); try { - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file.withAttributes(PathAttributes.EMPTY)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file.withAttributes(PathAttributes.EMPTY)), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } catch(NotfoundException e) { // } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -99,11 +99,11 @@ public class B2DeleteFeatureTest extends AbstractB2Test { final Path bucket = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); final Path file = new Path(bucket, String.format("%s %s", new AlphanumericRandomStringService().random(), "1"), EnumSet.of(Path.Type.file)); new B2TouchFeature(session, fileid).touch(new B2WriteFeature(session, fileid), file, new TransferStatus()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file.withAttributes(PathAttributes.EMPTY)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file.withAttributes(PathAttributes.EMPTY)), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new B2FindFeature(session, fileid).find(file)); assertFalse(new DefaultFindFeature(session).find(file)); - new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).toList(), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, new B2VersionIdProvider(session)).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).toList(), LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, new B2VersionIdProvider(session)).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -111,7 +111,7 @@ public class B2DeleteFeatureTest extends AbstractB2Test { final B2VersionIdProvider fileid = new B2VersionIdProvider(session); final Path bucket = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); final Path directory = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(bucket, String.format("%s %s", new AlphanumericRandomStringService().random(), "1"), EnumSet.of(Path.Type.directory)), new TransferStatus()); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(bucket, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(bucket, directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new B2FindFeature(session, fileid).find(directory)); assertFalse(new B2FindFeature(session, fileid).find(bucket)); } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2DirectoryFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2DirectoryFeatureTest.java index ca8ddf144e..fd8ade66c6 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2DirectoryFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2DirectoryFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.b2; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.ConflictException; @@ -45,7 +45,7 @@ public class B2DirectoryFeatureTest extends AbstractB2Test { assertTrue(feature.isSupported(bucket.getParent(), bucket.getName())); feature.mkdir(new B2WriteFeature(session, fileid), bucket, new TransferStatus()); assertThrows(ConflictException.class, () -> feature.mkdir(new B2WriteFeature(session, fileid), bucket, new TransferStatus())); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = ConflictException.class) @@ -88,11 +88,11 @@ public class B2DirectoryFeatureTest extends AbstractB2Test { assertNotEquals(PathAttributes.EMPTY, new B2AttributesFinderFeature(session, fileid).find(directory)); assertEquals(directory.attributes().getVersionId(), new B2VersionIdProvider(session).getVersionId(new Path(bucket, filename, EnumSet.of(Path.Type.directory)))); // Mark as hidden - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(directory).withAttributes(PathAttributes.EMPTY)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(directory).withAttributes(PathAttributes.EMPTY)), LoginCallback.noop, new Delete.DisabledCallback()); // .bzEmpty is deleted not hidden assertFalse(new B2FindFeature(session, fileid).find(directory)); assertFalse(new DefaultFindFeature(session).find(directory)); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -105,6 +105,6 @@ public class B2DirectoryFeatureTest extends AbstractB2Test { final Path directory = new B2DirectoryFeature(session, fileid).mkdir( new B2WriteFeature(session, fileid), new Path(bucket, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), status); assertEquals(timestamp, new B2AttributesFinderFeature(session, fileid).find(directory).getModificationDate()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2FindFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2FindFeatureTest.java index ab67eca2d0..7c1b479535 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2FindFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2FindFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.CachingFindFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.features.Delete; @@ -49,7 +49,7 @@ public class B2FindFeatureTest extends AbstractB2Test { new B2TouchFeature(session, fileid).touch(new B2WriteFeature(session, fileid), file, new TransferStatus()); assertTrue(new B2FindFeature(session, fileid).find(file)); assertFalse(new B2FindFeature(session, fileid).find(new Path(bucket, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)))); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -78,7 +78,7 @@ public class B2FindFeatureTest extends AbstractB2Test { assertTrue(new B2FindFeature(session, fileid).find(new Path(container, prefix, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); assertTrue(new B2ObjectListService(session, fileid).list(intermediate, new DisabledListProgressListener()).contains(test)); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new B2FindFeature(session, fileid).find(test)); assertFalse(new B2FindFeature(session, fileid).find(intermediate)); final PathCache cache = new PathCache(1); diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeCopyFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeCopyFeatureTest.java index c8b08d89a1..b3ab6b5f5a 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeCopyFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeCopyFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Find; @@ -64,7 +64,7 @@ public class B2LargeCopyFeatureTest extends AbstractB2Test { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -89,7 +89,7 @@ public class B2LargeCopyFeatureTest extends AbstractB2Test { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy, target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy, target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -111,6 +111,6 @@ public class B2LargeCopyFeatureTest extends AbstractB2Test { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadServiceTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadServiceTest.java index 9adb54fe74..37cf3cae7b 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadServiceTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadServiceTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -96,7 +96,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { in.close(); buffer.close(); assertArrayEquals(content, buffer.toByteArray()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -124,7 +124,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { } }; try { - service.upload(new B2WriteFeature(session, fileid), test, new Local(System.getProperty("java.io.tmpdir"), name), new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, count, status, new DisabledLoginCallback()); + service.upload(new B2WriteFeature(session, fileid), test, new Local(System.getProperty("java.io.tmpdir"), name), new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, count, status, LoginCallback.noop); } catch(BackgroundException e) { // Expected @@ -140,7 +140,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { final TransferStatus append = new TransferStatus().setAppend(true).setLength(content.length); service.upload(new B2WriteFeature(session, fileid), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, StreamListener.noop, append, - new DisabledLoginCallback()); + LoginCallback.noop); assertEquals(content.length, append.getResponse().getSize()); assertTrue(new B2FindFeature(session, fileid).find(test)); assertEquals(content.length, new B2AttributesFinderFeature(session, fileid).find(test).getSize()); @@ -150,7 +150,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -180,7 +180,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { }; final BytecountStreamListener count = new BytecountStreamListener(); try { - feature.upload(new B2WriteFeature(session, fileid), test, new Local(System.getProperty("java.io.tmpdir"), name), new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, count, status, new DisabledLoginCallback()); + feature.upload(new B2WriteFeature(session, fileid), test, new Local(System.getProperty("java.io.tmpdir"), name), new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, count, status, LoginCallback.noop); } catch(BackgroundException e) { // Expected @@ -199,7 +199,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { final TransferStatus append = new TransferStatus().setAppend(true).setLength(2L * 1000L * 1000L).setOffset(5 * 1000L * 1000L); feature.upload(new B2WriteFeature(session, fileid), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, count, append, - new DisabledLoginCallback()); + LoginCallback.noop); assertEquals(6 * 1000L * 1000L, count.getSent()); assertTrue(append.isComplete()); assertEquals(content.length, append.getResponse().getSize()); @@ -210,7 +210,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeatureTest.java index b950e25385..946c2adc7e 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LargeUploadWriteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.StatusOutputStream; @@ -68,7 +68,7 @@ public class B2LargeUploadWriteFeatureTest extends AbstractB2Test { stream.close(); assertArrayEquals(content, compare); assertEquals(1503654614004L, new B2AttributesFinderFeature(session, fileid).find(file).getModificationDate()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -94,7 +94,7 @@ public class B2LargeUploadWriteFeatureTest extends AbstractB2Test { stream.close(); assertArrayEquals(content, compare); assertEquals(1503654614004L, new B2AttributesFinderFeature(session, fileid).find(file).getModificationDate()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -121,6 +121,6 @@ public class B2LargeUploadWriteFeatureTest extends AbstractB2Test { stream.close(); assertArrayEquals(content, compare); assertEquals(1503654614004L, new B2AttributesFinderFeature(session, fileid).find(file).getModificationDate()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LifecycleFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LifecycleFeatureTest.java index c26638163d..ed99c4aab7 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2LifecycleFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2LifecycleFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.b2; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.lifecycle.LifecycleConfiguration; @@ -46,6 +46,6 @@ public class B2LifecycleFeatureTest extends AbstractB2Test { assertEquals(1, configuration.getTransition(), 0L); new B2LifecycleFeature(session, fileid).setConfiguration(bucket, LifecycleConfiguration.empty()); assertEquals(LifecycleConfiguration.empty(), new B2LifecycleFeature(session, fileid).getConfiguration(bucket)); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2MoveFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2MoveFeatureTest.java index 87ba68af97..9f68d07447 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2MoveFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2MoveFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.synchronization.Comparison; @@ -50,6 +50,6 @@ public class B2MoveFeatureTest extends AbstractB2Test { assertTrue(new B2FindFeature(session, fileid).find(target)); assertEquals(target.attributes(), new B2AttributesFinderFeature(session, fileid).find(target)); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, test.attributes(), target.attributes())); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2ObjectListServiceTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2ObjectListServiceTest.java index e013dbf64f..07393f64bf 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2ObjectListServiceTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2ObjectListServiceTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.IndexedListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.VersioningConfiguration; @@ -76,7 +76,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { } }).isEmpty()); assertTrue(callback.get()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -88,7 +88,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(".", folder.getName()); assertTrue(new B2ObjectListService(session, fileid).list(folder, new DisabledListProgressListener()).isEmpty()); assertTrue(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).contains(folder)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(folder, bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(folder, bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -102,7 +102,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(folder, test.getParent()); assertTrue(new B2ObjectListService(session, fileid).list(test, new DisabledListProgressListener()).isEmpty()); assertTrue(new B2ObjectListService(session, fileid).list(folder, new DisabledListProgressListener()).contains(test)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, folder, bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, folder, bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,7 +115,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(".", file.getName()); assertEquals(folder, file.getParent()); assertTrue(new B2ObjectListService(session, fileid).list(folder, new DisabledListProgressListener()).contains(file)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(file, folder, bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(file, folder, bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -127,7 +127,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(bucket, file.getParent()); assertEquals("..", file.getName()); assertTrue(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).contains(file)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(file, bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(file, bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -153,9 +153,9 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertNull(list.find(new SimplePathPredicate(file)).attributes().getRevision()); assertEquals(0L, list.find(new SimplePathPredicate(file)).attributes().getSize()); assertSame(bucket, list.find(new SimplePathPredicate(file)).getParent()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).contains(file)); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -168,7 +168,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { final AttributedList list = new B2ObjectListService(session, fileid, 1, new VersioningConfiguration(true)).list(bucket, new DisabledListProgressListener()); assertTrue(list.contains(file1)); assertTrue(list.contains(file2)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(bucket, file1, file2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(bucket, file1, file2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -216,7 +216,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(Long.valueOf(1L), list.find(path -> path.attributes().isDuplicate()).attributes().getRevision()); } // Add hide marker - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file.withAttributes(new DefaultPathAttributes(file.attributes()).setVersionId(null))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file.withAttributes(new DefaultPathAttributes(file.attributes()).setVersionId(null))), LoginCallback.noop, new Delete.DisabledCallback()); { final AttributedList list = new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()); assertEquals(3, list.size()); @@ -242,9 +242,9 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(list, versions); assertFalse(versions.contains(other)); for(Path f : list) { - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), LoginCallback.noop, new Delete.DisabledCallback()); } - new B2DeleteFeature(session, fileid).delete(Arrays.asList(other, bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(other, bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -293,7 +293,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(response.getFileId(), list.find(new SimplePathPredicate(file)).attributes().getVersionId()); } // Add hide marker - new B2DeleteFeature(session, fileid, VersioningConfiguration.empty()).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid, VersioningConfiguration.empty()).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new B2ObjectListService(session, fileid, 1, VersioningConfiguration.empty()).list(bucket, new DisabledListProgressListener()).isEmpty()); assertFalse(new B2FindFeature(session, fileid).find(file)); assertFalse(new DefaultFindFeature(session).find(file)); @@ -307,9 +307,9 @@ public class B2ObjectListServiceTest extends AbstractB2Test { final AttributedList list = new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()); assertEquals(list, new B2VersioningFeature(session, fileid).list(file, new DisabledListProgressListener())); for(Path f : list) { - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), LoginCallback.noop, new Delete.DisabledCallback()); } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -337,25 +337,25 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertSame(folder1, list.find(new SimplePathPredicate(file1)).getParent()); assertSame(folder1, list.find(new SimplePathPredicate(folder2)).getParent()); // Nullify version to add delete marker - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(file2).withAttributes(new DefaultPathAttributes(file2.attributes()).setVersionId(null))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(file2).withAttributes(new DefaultPathAttributes(file2.attributes()).setVersionId(null))), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new B2ObjectListService(session, fileid, 1, VersioningConfiguration.empty()).list(folder2, new DisabledListProgressListener()).isEmpty()); assertFalse(new B2ObjectListService(session, fileid).list(folder2, new DisabledListProgressListener()).isEmpty()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(folder2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(folder2), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new B2ObjectListService(session, fileid).list(folder2, new DisabledListProgressListener()).contains(file2)); assertThrows(NotfoundException.class, () -> new B2ObjectListService(session, fileid, 1, VersioningConfiguration.empty()).list(folder2, new DisabledListProgressListener())); // Nullify version to add delete marker - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(file1).withAttributes(new DefaultPathAttributes(file1.attributes()).setVersionId(null))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(file1).withAttributes(new DefaultPathAttributes(file1.attributes()).setVersionId(null))), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new B2ObjectListService(session, fileid, 1, VersioningConfiguration.empty()).list(folder1, new DisabledListProgressListener()).isEmpty()); assertTrue(new B2ObjectListService(session, fileid).list(folder1, new DisabledListProgressListener()).contains(folder2)); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(folder1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(folder1), LoginCallback.noop, new Delete.DisabledCallback()); assertThrows(NotfoundException.class, () -> new B2ObjectListService(session, fileid, 1, VersioningConfiguration.empty()).list(folder1, new DisabledListProgressListener())); for(Path f : new B2ObjectListService(session, fileid).list(folder1, new DisabledListProgressListener())) { - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), LoginCallback.noop, new Delete.DisabledCallback()); } for(Path f : new B2ObjectListService(session, fileid).list(folder2, new DisabledListProgressListener())) { - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), LoginCallback.noop, new Delete.DisabledCallback()); } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -374,7 +374,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertFalse(foundFolder1.attributes().isDuplicate()); } // Nullify version to add delete marker - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(file1).withAttributes(new DefaultPathAttributes(file1.attributes()).setVersionId(null))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(new Path(file1).withAttributes(new DefaultPathAttributes(file1.attributes()).setVersionId(null))), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new B2ObjectListService(session, fileid, 1, VersioningConfiguration.empty()).list(bucket, new DisabledListProgressListener()).isEmpty()); { final AttributedList list = new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()); @@ -382,9 +382,9 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(folder1, list.iterator().next()); } for(Path f : new B2ObjectListService(session, fileid).list(folder1, new DisabledListProgressListener())) { - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), LoginCallback.noop, new Delete.DisabledCallback()); } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -411,16 +411,16 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertFalse(foundFolder2.attributes().isDuplicate()); } // Nullify version to add delete marker - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file.withAttributes(new DefaultPathAttributes(file.attributes()).setVersionId(null))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file.withAttributes(new DefaultPathAttributes(file.attributes()).setVersionId(null))), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new DefaultFindFeature(session).find(folder1, new DisabledListProgressListener())); assertTrue(new B2ObjectListService(session, fileid).list(folder1, new DisabledListProgressListener()).contains(folder2)); assertTrue(new DefaultFindFeature(session).find(folder2, new DisabledListProgressListener())); assertEquals(2, new B2ObjectListService(session, fileid).list(folder2, new DisabledListProgressListener()).size()); assertThrows(NotfoundException.class, () -> new B2ObjectListService(session, fileid, 1, VersioningConfiguration.empty()).list(folder2, new DisabledListProgressListener())); for(Path f : new B2ObjectListService(session, fileid).list(folder2, new DisabledListProgressListener())) { - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(f), LoginCallback.noop, new Delete.DisabledCallback()); } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -435,7 +435,7 @@ public class B2ObjectListServiceTest extends AbstractB2Test { assertEquals(2, list.size()); assertTrue(list.contains(file1)); assertTrue(list.contains(folder1)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(file1, folder1, bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(file1, folder1, bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -464,8 +464,8 @@ public class B2ObjectListServiceTest extends AbstractB2Test { }); for(int i = 0; i < list.size(); i++) { assertEquals(files.get(i), list.get(i).getName()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(list.get(i)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(list.get(i)), LoginCallback.noop, new Delete.DisabledCallback()); } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2ReadFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2ReadFeatureTest.java index 49e7add0a5..c7dac9a426 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2ReadFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2ReadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.exception.NotfoundException; @@ -83,9 +83,9 @@ public class B2ReadFeatureTest extends AbstractB2Test { // Ignore update. As with unknown length for chunked transfer return this; } - }, new DisabledLoginCallback()); + }, LoginCallback.noop); assertEquals(923L, local.attributes().getSize()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -112,7 +112,7 @@ public class B2ReadFeatureTest extends AbstractB2Test { assertNotNull(in); in.close(); } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -144,7 +144,7 @@ public class B2ReadFeatureTest extends AbstractB2Test { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -176,7 +176,7 @@ public class B2ReadFeatureTest extends AbstractB2Test { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -193,7 +193,7 @@ public class B2ReadFeatureTest extends AbstractB2Test { final CountingInputStream in = new CountingInputStream(new B2ReadFeature(session, fileid).read(file, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -209,14 +209,14 @@ public class B2ReadFeatureTest extends AbstractB2Test { test.attributes().setVersionId(invalidId); fileid.cache(test, invalidId); try { - final InputStream in = new B2ReadFeature(session, fileid).read(test, new TransferStatus().setRemote(test.attributes()), new DisabledLoginCallback()); + final InputStream in = new B2ReadFeature(session, fileid).read(test, new TransferStatus().setRemote(test.attributes()), LoginCallback.noop); fail(); } catch(NotfoundException e) { // } assertNull(test.attributes().getVersionId()); - new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).toList(), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(new B2ObjectListService(session, fileid).list(bucket, new DisabledListProgressListener()).toList(), LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2SearchFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2SearchFeatureTest.java index 333889cbe2..7c84cf1bb2 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2SearchFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2SearchFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.features.Delete; @@ -52,7 +52,7 @@ public class B2SearchFeatureTest extends AbstractB2Test { assertNotNull(feature.search(bucket, new SearchFilter(StringUtils.substring(name, 0, name.length() - 2)), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); final Path subdir = new Path(bucket, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); assertNull(feature.search(subdir, new SearchFilter(name), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -65,7 +65,7 @@ public class B2SearchFeatureTest extends AbstractB2Test { assertNotNull(feature.search(bucket, new SearchFilter(name), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); assertNotNull(feature.search(new Path("/", EnumSet.of(Path.Type.directory, Path.Type.volume)), new SearchFilter(StringUtils.substring(name, 2)), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); assertNotNull(feature.search(new Path("/", EnumSet.of(Path.Type.directory, Path.Type.volume)), new SearchFilter(StringUtils.substring(name, 0, name.length() - 2)), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,6 +91,6 @@ public class B2SearchFeatureTest extends AbstractB2Test { assertNotNull(result.find(new SimplePathPredicate(filesubdir))); assertEquals(subdir, result.find(new SimplePathPredicate(filesubdir)).getParent()); } - new B2DeleteFeature(session, fileid).delete(Arrays.asList(file, filesubdir, subdir), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(file, filesubdir, subdir), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2SessionTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2SessionTest.java index c4e0375cc6..cda9656f2c 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2SessionTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2SessionTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.Session; import ch.cyberduck.core.exception.LoginFailureException; @@ -61,7 +61,7 @@ public class B2SessionTest { System.getProperties().getProperty("b2.user"), "s" )); final B2Session session = new B2Session(host, new DefaultX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2SingleUploadServiceTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2SingleUploadServiceTest.java index b5c89252a9..89ef926e07 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2SingleUploadServiceTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2SingleUploadServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -74,7 +74,7 @@ public class B2SingleUploadServiceTest extends AbstractB2Test { in.close(); buffer.close(); assertArrayEquals(content, buffer.toByteArray()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } \ No newline at end of file diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2ThresholdCopyFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2ThresholdCopyFeatureTest.java index 4f14e7b65b..150f36e3cc 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2ThresholdCopyFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2ThresholdCopyFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.StreamCopier; @@ -63,7 +63,7 @@ public class B2ThresholdCopyFeatureTest extends AbstractB2Test{ IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -88,6 +88,6 @@ public class B2ThresholdCopyFeatureTest extends AbstractB2Test{ IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2UrlProviderTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2UrlProviderTest.java index 2a594bb963..e512ef8519 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2UrlProviderTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2UrlProviderTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DescriptiveUrl; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -45,6 +45,6 @@ public class B2UrlProviderTest extends AbstractB2Test { assertEquals(0, provider.toUrl(bucket).size()); assertEquals(1, provider.toUrl(test).size()); assertNotNull(provider.toUrl(test).find(DescriptiveUrl.Type.http).getUrl()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2VersionIdProviderTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2VersionIdProviderTest.java index e36199cc3b..63c26386fb 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2VersionIdProviderTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2VersionIdProviderTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -58,7 +58,7 @@ public class B2VersionIdProviderTest extends AbstractB2Test { duplicate.setDuplicate(true); fileid.cache(new Path(file).withAttributes(duplicate), "d"); assertEquals(versionId, fileid.getVersionId(file)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(bucket, file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(bucket, file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -67,7 +67,7 @@ public class B2VersionIdProviderTest extends AbstractB2Test { final Path bucket = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); final Path folder = new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), new Path(bucket, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertNotNull(fileid.getVersionId(folder)); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(folder, bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(folder, bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2VersioningFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2VersioningFeatureTest.java index 0e0a2955db..99566e785c 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2VersioningFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2VersioningFeatureTest.java @@ -20,7 +20,7 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -89,8 +89,8 @@ public class B2VersioningFeatureTest extends AbstractB2Test { assertEquals(status.getResponse().getVersionId(), versions.get(0).attributes().getVersionId()); assertEquals(initialVersion, versions.get(1).attributes().getVersionId()); for(Path version : new B2ListService(session, fileid).list(room, new DisabledListProgressListener())) { - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(version), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(version), LoginCallback.noop, new Delete.DisabledCallback()); } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/B2WriteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/b2/B2WriteFeatureTest.java index 79d3f52a2f..0b4edd1e3b 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/B2WriteFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/B2WriteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.b2; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.ChecksumException; @@ -104,6 +104,6 @@ public class B2WriteFeatureTest extends AbstractB2Test { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(new ByteArrayInputStream(overwriteContent), overwrite); assertNotEquals(new B2AttributesFinderFeature(session, fileid).toAttributes(response), new B2AttributesFinderFeature(session, fileid).toAttributes(overwrite.getStatus())); assertNotEquals(((B2FileResponse) response).getFileId(), ((B2FileResponse) overwrite.getStatus()).getFileId()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java index ff66639716..a5069a1077 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.VersioningConfiguration; import ch.cyberduck.core.b2.AbstractB2Test; @@ -74,10 +74,10 @@ public class B2DirectoryFeatureTest extends AbstractB2Test { assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); assertEquals(versionId, cryptomator.getFeature(session, AttributesFinder.class, new B2AttributesFinderFeature(session, fileid)).find(test).getVersionId()); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new CryptoListService(session, new B2ObjectListService(session, fileid, 1, VersioningConfiguration.empty()), cryptomator).list(vault, new DisabledListProgressListener()) .toStream().filter(f -> !f.attributes().isDuplicate()).collect(Collectors.toList()).isEmpty()); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -92,6 +92,6 @@ public class B2DirectoryFeatureTest extends AbstractB2Test { final Path test = cryptomator.getFeature(session, Directory.class, new B2DirectoryFeature(session, fileid)).mkdir( cryptomator.getFeature(session, Write.class, new B2WriteFeature(session, fileid)), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java index 9e6afd11bb..154cc5733d 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.b2.AbstractB2Test; @@ -103,7 +103,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { final InputStream in = new CryptoReadFeature(session, new B2ReadFeature(session, fileid), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -139,7 +139,7 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { final InputStream in = new CryptoReadFeature(session, new B2ReadFeature(session, fileid), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java index f0f88c9227..716526b3df 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.b2.AbstractB2Test; import ch.cyberduck.core.b2.B2DeleteFeature; @@ -84,6 +84,6 @@ public class B2LargeUploadWriteFeatureTest extends AbstractB2Test { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2ListServiceTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2ListServiceTest.java index 4e67fcf8ad..fa53cc3022 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2ListServiceTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2ListServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.b2.AbstractB2Test; import ch.cyberduck.core.b2.B2DeleteFeature; @@ -67,6 +67,6 @@ public class B2ListServiceTest extends AbstractB2Test { new CryptoWriteFeature<>(session, new B2WriteFeature(session, fileid), cryptomator), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); test.attributes().setVersionId(new CryptoVersionIdProvider(session, fileid, cryptomator).getVersionId(test)); assertEquals(test, new CryptoListService(session, new B2ListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()).get(0)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java index c2744bcfc2..29b7429ec3 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.b2.AbstractB2Test; import ch.cyberduck.core.b2.B2AttributesFinderFeature; @@ -72,7 +72,7 @@ public class B2TouchFeatureTest extends AbstractB2Test { assertNotNull(test.attributes().getVersionId()); assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test)); assertEquals(test.attributes(), cryptomator.getFeature(session, AttributesFinder.class, new B2AttributesFinderFeature(session, fileid)).find(test)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -90,7 +90,7 @@ public class B2TouchFeatureTest extends AbstractB2Test { assertEquals(0L, test.attributes().getSize()); assertEquals(0L, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(test)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -108,6 +108,6 @@ public class B2TouchFeatureTest extends AbstractB2Test { assertEquals(0L, status.getResponse().getSize()); assertNotNull(test.attributes().getVersionId()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java index 6a235128a7..ae146ad528 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.b2.AbstractB2Test; @@ -91,6 +91,6 @@ public class B2WriteFeatureTest extends AbstractB2Test { final InputStream in = new CryptoReadFeature(session, new B2ReadFeature(session, fileid), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 596b4017da..507a89862b 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -95,7 +95,7 @@ public class CopyWorkerTest extends AbstractB2Test { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new B2ReadFeature(session, fileid), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -121,7 +121,7 @@ public class CopyWorkerTest extends AbstractB2Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -148,7 +148,7 @@ public class CopyWorkerTest extends AbstractB2Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -181,7 +181,7 @@ public class CopyWorkerTest extends AbstractB2Test { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -207,7 +207,7 @@ public class CopyWorkerTest extends AbstractB2Test { assertTrue(new B2FindFeature(session, fileid).find(cleartextFile)); assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(encryptedFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -235,7 +235,7 @@ public class CopyWorkerTest extends AbstractB2Test { assertTrue(new B2FindFeature(session, fileid).find(cleartextFolder)); assertTrue(new B2FindFeature(session, fileid).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -264,7 +264,7 @@ public class CopyWorkerTest extends AbstractB2Test { assertTrue(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(encryptedFile)); assertTrue(new B2FindFeature(session, fileid).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); } @Test @@ -294,6 +294,6 @@ public class CopyWorkerTest extends AbstractB2Test { final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new B2FindFeature(session, fileid).find(fileRenamed)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java index 4af36d3fc4..18f7968437 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java @@ -17,10 +17,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -101,7 +101,7 @@ public class CryptoB2SingleTransferWorkerTest extends AbstractB2Test { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); @@ -120,7 +120,7 @@ public class CryptoB2SingleTransferWorkerTest extends AbstractB2Test { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 1bec849631..bfb01c6172 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -76,11 +76,11 @@ public class MoveWorkerTest extends AbstractB2Test { cryptomator.getFeature(session, Write.class, new B2WriteFeature(session, fileid)), encryptedFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); // move file into vault - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(new DefaultFindFeature(session).find(clearFile)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -102,13 +102,13 @@ public class MoveWorkerTest extends AbstractB2Test { // move directory into vault final Path encryptedFolder = new Path(vault, clearFolder.getName(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, clearFile.getName(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertFalse(new DefaultFindFeature(session).find(clearFolder)); assertThrows(NotfoundException.class, () -> new DefaultFindFeature(session).find(clearFile)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -133,12 +133,12 @@ public class MoveWorkerTest extends AbstractB2Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move file outside vault final Path fileRenamed = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, clearFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, clearFolder), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -161,15 +161,15 @@ public class MoveWorkerTest extends AbstractB2Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move directory outside vault final Path directoryRenamed = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(encryptedFolder)); assertFalse(cryptomator.getFeature(session, Find.class, new B2FindFeature(session, fileid)).find(encryptedFile)); assertTrue(new B2FindFeature(session, fileid).find(directoryRenamed)); final Path fileRenamed = new Path(directoryRenamed, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new B2FindFeature(session, fileid).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, directoryRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new B2DeleteFeature(session, fileid)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, directoryRenamed), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java index 338dc2d4d3..22adffc989 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Attributes; import ch.cyberduck.core.CachingAttributesFinderFeature; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -90,6 +90,6 @@ public class CachingAttributesFinderFeatureTest extends AbstractB2Test { catch(NotfoundException e) { // Expected } - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/shared/CachingFindFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/shared/CachingFindFeatureTest.java index 9fc34a9c00..1a44205f5f 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/shared/CachingFindFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/shared/CachingFindFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.CachingAttributesFinderFeature; import ch.cyberduck.core.CachingFindFeature; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -59,7 +59,7 @@ public class CachingFindFeatureTest extends AbstractB2Test { assertTrue(f.find(test)); // Find without version id set in attributes assertTrue(f.find(new Path(test).withAttributes(PathAttributes.EMPTY))); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -92,7 +92,7 @@ public class CachingFindFeatureTest extends AbstractB2Test { }).find(new Path(test).withAttributes(PathAttributes.EMPTY))); // Test wrong type assertFalse(f.find(new Path(bucket, test.getName(), EnumSet.of(Path.Type.directory)))); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java index a77aa8c536..f27f3fa666 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.shared; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.b2.AbstractB2Test; import ch.cyberduck.core.b2.B2DeleteFeature; @@ -50,7 +50,7 @@ public class DefaultAttributesFinderFeatureTest extends AbstractB2Test { new B2TouchFeature(session, fileid).touch(new B2WriteFeature(session, fileid), file, new TransferStatus()); // Find without version id set in attributes assertNotNull(new DefaultAttributesFinderFeature(session).find(file).getVersionId()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java index c252ff8e6e..f1871c31dc 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.b2.AbstractB2Test; import ch.cyberduck.core.b2.B2DeleteFeature; @@ -82,7 +82,7 @@ public class DefaultDownloadFeatureTest extends AbstractB2Test { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -113,6 +113,6 @@ public class DefaultDownloadFeatureTest extends AbstractB2Test { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultFindFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultFindFeatureTest.java index f3b5a4b62a..506c7768f3 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultFindFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/shared/DefaultFindFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.b2.AbstractB2Test; import ch.cyberduck.core.b2.B2DeleteFeature; @@ -55,7 +55,7 @@ public class DefaultFindFeatureTest extends AbstractB2Test { // Find without version id set in attributes assertTrue(new DefaultFindFeature(session).find(file)); assertTrue(new DefaultFindFeature(session).find(test)); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/backblaze/src/test/java/ch/cyberduck/core/worker/B2ConcurrentTransferWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/worker/B2ConcurrentTransferWorkerTest.java index 9ecd43d70d..fed4059d30 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/worker/B2ConcurrentTransferWorkerTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/worker/B2ConcurrentTransferWorkerTest.java @@ -19,11 +19,11 @@ import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.DisabledTranscriptListener; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -110,7 +110,7 @@ public class B2ConcurrentTransferWorkerTest extends AbstractB2Test { return super.getProperty(key); } }; - final LoginConnectionService connect = new LoginConnectionService(new DisabledLoginCallback(), + final LoginConnectionService connect = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new TestPasswordStore(), ProgressListener.noop); @@ -181,6 +181,6 @@ public class B2ConcurrentTransferWorkerTest extends AbstractB2Test { assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); assertTrue(failed.get()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/backblaze/src/test/java/ch/cyberduck/core/worker/B2SingleTransferWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/worker/B2SingleTransferWorkerTest.java index 0376db335d..8451ce7f8d 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/worker/B2SingleTransferWorkerTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/worker/B2SingleTransferWorkerTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; @@ -136,7 +136,7 @@ public class B2SingleTransferWorkerTest extends VaultTest { return super._getFeature(type); } }; - new LoginConnectionService(new DisabledLoginCallback(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new TestPasswordStore(), ProgressListener.noop).check(session, CancelCallback.noop); @@ -150,7 +150,7 @@ public class B2SingleTransferWorkerTest extends VaultTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); local.delete(); @@ -162,6 +162,6 @@ public class B2SingleTransferWorkerTest extends VaultTest { assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); assertTrue(failed.get()); - new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new B2DeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxAttributesFinderFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxAttributesFinderFeatureTest.java index cd39885e45..909ac05cf0 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxAttributesFinderFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxAttributesFinderFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.box; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -46,7 +46,7 @@ public class BoxAttributesFinderFeatureTest extends AbstractBoxTest { f.find(test); } finally { - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -84,7 +84,7 @@ public class BoxAttributesFinderFeatureTest extends AbstractBoxTest { catch(NotfoundException e) { // Expected } - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -110,6 +110,6 @@ public class BoxAttributesFinderFeatureTest extends AbstractBoxTest { catch(NotfoundException e) { // Expected } - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxCopyFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxCopyFeatureTest.java index c00d6fedaa..fa3b0697d8 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxCopyFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxCopyFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.box; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -50,8 +50,8 @@ public class BoxCopyFeatureTest extends AbstractBoxTest { new BoxCopyFeature(session, fileid).copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new BoxFindFeature(session, fileid).find(test.withAttributes(PathAttributes.EMPTY))); assertTrue(new BoxFindFeature(session, fileid).find(copy.withAttributes(PathAttributes.EMPTY))); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -67,7 +67,7 @@ public class BoxCopyFeatureTest extends AbstractBoxTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new BoxDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -82,7 +82,7 @@ public class BoxCopyFeatureTest extends AbstractBoxTest { assertTrue(new BoxFindFeature(session, fileid).find(file)); assertTrue(new BoxFindFeature(session, fileid).find(copy)); assertTrue(new BoxFindFeature(session, fileid).find(new Path(copy, name, EnumSet.of(Path.Type.file)))); - new BoxDeleteFeature(session, fileid).delete(Arrays.asList(copy, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Arrays.asList(copy, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -90,6 +90,6 @@ public class BoxCopyFeatureTest extends AbstractBoxTest { final BoxFileidProvider fileid = new BoxFileidProvider(session); final Path test = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new BoxCopyFeature(session, fileid).copy(test, new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), - new DisabledLoginCallback(), StreamListener.noop); + LoginCallback.noop, StreamListener.noop); } } diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxDeleteFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxDeleteFeatureTest.java index 5a13240bd1..e109e52781 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxDeleteFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxDeleteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.box; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -44,7 +44,7 @@ public class BoxDeleteFeatureTest extends AbstractBoxTest { public void testDeleteNotFound() throws Exception { final Path test = new Path(new DefaultHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final BoxFileidProvider fileid = new BoxFileidProvider(session); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonMap(test, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonMap(test, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -53,7 +53,7 @@ public class BoxDeleteFeatureTest extends AbstractBoxTest { final Path directory = new BoxDirectoryFeature(session, fileid).mkdir(new BoxWriteFeature(session, fileid), new Path( new AlphanumericRandomStringService().random(), EnumSet.of(AbstractPath.Type.directory)), new TransferStatus()); assertTrue(new BoxFindFeature(session, fileid).find(directory, new DisabledListProgressListener())); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new BoxFindFeature(session, fileid).find(directory, new DisabledListProgressListener()))); } @@ -65,11 +65,11 @@ public class BoxDeleteFeatureTest extends AbstractBoxTest { final Path file2 = new BoxTouchFeature(session, fileid).touch(new BoxWriteFeature(session, fileid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new BoxFindFeature(session, fileid).find(file1)); assertTrue(new BoxFindFeature(session, fileid).find(file2)); - new BoxDeleteFeature(session, fileid).delete(Arrays.asList(file1, file2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Arrays.asList(file1, file2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new BoxFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); assertFalse((new BoxFindFeature(session, fileid).find(file2, new DisabledListProgressListener()))); assertTrue(new BoxFindFeature(session, fileid).find(folder, new DisabledListProgressListener())); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new BoxFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); } } \ No newline at end of file diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxDirectoryFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxDirectoryFeatureTest.java index f489a38d66..4d819ce1ae 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxDirectoryFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxDirectoryFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.box; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -46,7 +46,7 @@ public class BoxDirectoryFeatureTest extends AbstractBoxTest { assertEquals(0L, folder.attributes().getSize()); assertNotEquals(-1L, folder.attributes().getModificationDate()); assertThrows(ConflictException.class, () -> new BoxDirectoryFeature(session, fileid).mkdir(new BoxWriteFeature(session, fileid), folder, new TransferStatus())); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(folder)); } diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxFileidProviderTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxFileidProviderTest.java index 7f7c36bfac..421b31f59b 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxFileidProviderTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxFileidProviderTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.box; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -65,6 +65,6 @@ public class BoxFileidProviderTest extends AbstractBoxTest { catch(NotfoundException e) { // Expected } - new BoxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxFindFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxFindFeatureTest.java index 591a57ee18..575c8a100c 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxFindFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.box; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; @@ -54,7 +54,7 @@ public class BoxFindFeatureTest extends AbstractBoxTest { new BoxWriteFeature(session, fileid), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new BoxFindFeature(session, fileid).find(folder)); assertFalse(new BoxFindFeature(session, fileid).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -64,6 +64,6 @@ public class BoxFindFeatureTest extends AbstractBoxTest { new BoxTouchFeature(session, fileid).touch(new BoxWriteFeature(session, fileid), file, new TransferStatus()); assertTrue(new BoxFindFeature(session, fileid).find(file)); assertFalse(new BoxFindFeature(session, fileid).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxLargeUploadServiceTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxLargeUploadServiceTest.java index 41b2917c0f..82ce2aafa8 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxLargeUploadServiceTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxLargeUploadServiceTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.box.io.swagger.client.model.File; @@ -69,7 +69,7 @@ public class BoxLargeUploadServiceTest extends AbstractBoxTest { final byte[] compare = new byte[content.length]; IOUtils.readFully(new BoxReadFeature(session, fileid).read(file, new TransferStatus().setLength(content.length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxMoveFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxMoveFeatureTest.java index 22b37f291b..9e3ed4993d 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxMoveFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxMoveFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.box; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -56,7 +56,7 @@ public class BoxMoveFeatureTest extends AbstractBoxTest { assertNotEquals(test.attributes().getETag(), target.attributes().getETag()); assertEquals(target.attributes(), new BoxAttributesFinderFeature(session, fileid).find(target)); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, test.attributes(), target.attributes())); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -68,7 +68,7 @@ public class BoxMoveFeatureTest extends AbstractBoxTest { new BoxMoveFeature(session, fileid).move(test, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new BoxFindFeature(session, fileid).find(test.withAttributes(PathAttributes.EMPTY))); assertTrue(new BoxFindFeature(session, fileid).find(target)); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -84,7 +84,7 @@ public class BoxMoveFeatureTest extends AbstractBoxTest { assertTrue(new BoxFindFeature(session, fileid).find(override)); assertEquals(test.attributes().getModificationDate(), override.attributes().getModificationDate()); assertEquals(test.attributes().getChecksum(), override.attributes().getChecksum()); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -101,6 +101,6 @@ public class BoxMoveFeatureTest extends AbstractBoxTest { final Path file = new BoxTouchFeature(session, fileid).touch(new BoxWriteFeature(session, fileid), new Path(new DefaultHomeFinderService(session).find(), StringUtils.capitalize(name), EnumSet.of(Path.Type.file)), new TransferStatus()); final Path rename = new Path(new DefaultHomeFinderService(session).find(), StringUtils.lowerCase(name), EnumSet.of(Path.Type.file)); new BoxMoveFeature(session, fileid).move(file, rename, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(rename), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(rename), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxReadFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxReadFeatureTest.java index 8399f9c19f..c2217df044 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxReadFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxReadFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.box; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -43,7 +43,7 @@ public class BoxReadFeatureTest extends AbstractBoxTest { final InputStream in = new BoxReadFeature(session, fileid).read(test, new TransferStatus().setLength(0L), ConnectionCallback.noop); assertNotNull(in); in.close(); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } @@ -67,7 +67,7 @@ public class BoxReadFeatureTest extends AbstractBoxTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } @@ -91,6 +91,6 @@ public class BoxReadFeatureTest extends AbstractBoxTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/box/src/test/java/ch/cyberduck/core/box/BoxWriteFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BoxWriteFeatureTest.java index f95b40dabb..2db4fb91eb 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BoxWriteFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BoxWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.box; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.MimeTypeService; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; @@ -91,6 +91,6 @@ public class BoxWriteFeatureTest extends AbstractBoxTest { assertNotEquals(file.attributes().getModificationDate(), fileAttr.getModificationDate()); assertEquals(1503654615000L, fileAttr.getCreationDate()); //milliseconds are ignored by the Box - GMT: Friday, 25. August 2017 09:50:14 assertEquals(1503654614000L, fileAttr.getModificationDate()); //milliseconds are ignored by the Box - GMT: Friday, 25. August 2017 09:50:14 - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/box/src/test/java/ch/cyberduck/core/box/BufferWriteFeatureTest.java b/box/src/test/java/ch/cyberduck/core/box/BufferWriteFeatureTest.java index a922203777..c761760209 100644 --- a/box/src/test/java/ch/cyberduck/core/box/BufferWriteFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/BufferWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.box; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.StatusOutputStream; @@ -64,7 +64,7 @@ public class BufferWriteFeatureTest extends AbstractBoxTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -102,7 +102,7 @@ public class BufferWriteFeatureTest extends AbstractBoxTest { stream.close(); assertArrayEquals(content, compare); } - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -123,7 +123,7 @@ public class BufferWriteFeatureTest extends AbstractBoxTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -144,6 +144,6 @@ public class BufferWriteFeatureTest extends AbstractBoxTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BoxDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java b/box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java index 11a5413b2c..c149f60b28 100644 --- a/box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java +++ b/box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.box.AbstractBoxTest; @@ -108,7 +108,7 @@ public class BoxThresholdUploadServiceTest extends AbstractBoxTest { final InputStream in = new CryptoReadFeature(session, new BoxReadFeature(session, fileid), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new BoxDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new BoxDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/box/src/test/java/ch/cyberduck/core/cryptomator/BoxWriteFeatureTest.java b/box/src/test/java/ch/cyberduck/core/cryptomator/BoxWriteFeatureTest.java index 57edb534ed..4fbaf478d8 100644 --- a/box/src/test/java/ch/cyberduck/core/cryptomator/BoxWriteFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/cryptomator/BoxWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.box.AbstractBoxTest; import ch.cyberduck.core.box.BoxDeleteFeature; @@ -90,7 +90,7 @@ public class BoxWriteFeatureTest extends AbstractBoxTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - cryptomator.getFeature(session, Delete.class, new BoxDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new BoxDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -124,6 +124,6 @@ public class BoxWriteFeatureTest extends AbstractBoxTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - cryptomator.getFeature(session, Delete.class, new BoxDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new BoxDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/box/src/test/java/ch/cyberduck/core/cryptomator/BufferWriteFeatureTest.java b/box/src/test/java/ch/cyberduck/core/cryptomator/BufferWriteFeatureTest.java index e5231359e1..e6d49f6144 100644 --- a/box/src/test/java/ch/cyberduck/core/cryptomator/BufferWriteFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/cryptomator/BufferWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.box.AbstractBoxTest; import ch.cyberduck.core.box.BoxDeleteFeature; @@ -90,6 +90,6 @@ public class BufferWriteFeatureTest extends AbstractBoxTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - cryptomator.getFeature(session, Delete.class, new BoxDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new BoxDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/brick/src/main/java/ch/cyberduck/core/brick/BrickPairingFeature.java b/brick/src/main/java/ch/cyberduck/core/brick/BrickPairingFeature.java index dab5773528..4d03d20534 100644 --- a/brick/src/main/java/ch/cyberduck/core/brick/BrickPairingFeature.java +++ b/brick/src/main/java/ch/cyberduck/core/brick/BrickPairingFeature.java @@ -19,11 +19,11 @@ import ch.cyberduck.core.CertificateStoreFactory; import ch.cyberduck.core.DefaultIOExceptionMappingService; import ch.cyberduck.core.DisabledCertificateIdentityCallback; import ch.cyberduck.core.DisabledCertificateTrustCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledTranscriptListener; import ch.cyberduck.core.Host; import ch.cyberduck.core.HostPasswordStore; import ch.cyberduck.core.HostUrlProvider; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.PasswordStoreFactory; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.features.Pairing; @@ -70,7 +70,7 @@ public class BrickPairingFeature implements Pairing { CertificateStoreFactory.get()); final HttpConnectionPoolBuilder builder = new HttpConnectionPoolBuilder(bookmark, new ThreadLocalHostnameDelegatingTrustManager(trust, bookmark.getHostname()), key, ProxyFactory.get()); - final HttpClientBuilder configuration = builder.build(ProxyFactory.get(), new DisabledTranscriptListener(), new DisabledLoginCallback()); + final HttpClientBuilder configuration = builder.build(ProxyFactory.get(), new DisabledTranscriptListener(), LoginCallback.noop); configuration.setDefaultAuthSchemeRegistry(RegistryBuilder.create().build()); final CloseableHttpClient client = configuration.build(); final HttpRequestBase resource = new HttpDelete( diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickAttributesFinderFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickAttributesFinderFeatureTest.java index b93887c50d..6def7d0f4a 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickAttributesFinderFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickAttributesFinderFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.brick; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.Protocol; @@ -46,7 +46,7 @@ public class BrickAttributesFinderFeatureTest extends AbstractBrickTest { f.find(test); } finally { - new BrickDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -84,7 +84,7 @@ public class BrickAttributesFinderFeatureTest extends AbstractBrickTest { catch(NotfoundException e) { // Expected } - new BrickDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -107,6 +107,6 @@ public class BrickAttributesFinderFeatureTest extends AbstractBrickTest { catch(NotfoundException e) { // Expected } - new BrickDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickCopyFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickCopyFeatureTest.java index 0a1fc0c44a..e56fb0172e 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickCopyFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickCopyFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.brick; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -52,8 +52,8 @@ public class BrickCopyFeatureTest extends AbstractBrickTest { new BrickCopyFeature(session).copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new BrickFindFeature(session).find(test)); assertTrue(new BrickFindFeature(session).find(copy)); - new BrickDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new BrickDeleteFeature(session).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -64,15 +64,15 @@ public class BrickCopyFeatureTest extends AbstractBrickTest { IOUtils.write(random, local.getOutputStream(false)); final TransferStatus status = new TransferStatus().setLength(random.length); new BrickUploadFeature(session).upload(new BrickWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); local.delete(); assertTrue(new BrickFindFeature(session).find(test)); final Path copy = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new BrickCopyFeature(session).copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new BrickFindFeature(session).find(test)); assertTrue(new BrickFindFeature(session).find(copy)); - new BrickDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new BrickDeleteFeature(session).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -85,7 +85,7 @@ public class BrickCopyFeatureTest extends AbstractBrickTest { IOUtils.write(random, local.getOutputStream(false)); final TransferStatus status = new TransferStatus().setLength(random.length); new BrickUploadFeature(session).upload(new BrickWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); local.delete(); assertTrue(new BrickFindFeature(session).find(test)); final Path copy = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); @@ -94,7 +94,7 @@ public class BrickCopyFeatureTest extends AbstractBrickTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new BrickDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -108,7 +108,7 @@ public class BrickCopyFeatureTest extends AbstractBrickTest { IOUtils.write(random, local.getOutputStream(false)); final TransferStatus status = new TransferStatus().setLength(random.length); new BrickUploadFeature(session).upload(new BrickWriteFeature(session), file, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); local.delete(); assertTrue(new BrickFindFeature(session).find(file)); final Path copy = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); @@ -116,6 +116,6 @@ public class BrickCopyFeatureTest extends AbstractBrickTest { assertTrue(new BrickFindFeature(session).find(file)); assertTrue(new BrickFindFeature(session).find(copy)); assertTrue(new BrickFindFeature(session).find(new Path(copy, name, EnumSet.of(Path.Type.file)))); - new BrickDeleteFeature(session).delete(Arrays.asList(copy, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Arrays.asList(copy, directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickDeleteFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickDeleteFeatureTest.java index d657e565e5..107cdef26b 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickDeleteFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickDeleteFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.brick; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -51,11 +51,11 @@ public class BrickDeleteFeatureTest extends AbstractBrickTest { IOUtils.write(random, local.getOutputStream(false)); final TransferStatus status = new TransferStatus().setLength(random.length); new BrickUploadFeature(session).upload(new BrickWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); local.delete(); final String lock = new BrickLockFeature(session).lock(test); assertNotNull(lock); - new BrickDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -69,9 +69,9 @@ public class BrickDeleteFeatureTest extends AbstractBrickTest { final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new BrickTouchFeature(session).touch(new BrickWriteFeature(session), file, new TransferStatus()); assertTrue(new BrickFindFeature(session).find(file)); - new BrickDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new BrickFindFeature(session).find(folder)); - new BrickDeleteFeature(session).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new BrickFindFeature(session).find(room)); } } diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickDirectoryFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickDirectoryFeatureTest.java index 992c18f724..d134c56769 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickDirectoryFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickDirectoryFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.brick; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -39,6 +39,6 @@ public class BrickDirectoryFeatureTest extends AbstractBrickTest { final Path directory = new BrickDirectoryFeature(session).mkdir( new BrickWriteFeature(session), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertThrows(ConflictException.class, () -> new BrickDirectoryFeature(session).mkdir(new BrickWriteFeature(session), directory, new TransferStatus())); - new BrickDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickFindFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickFindFeatureTest.java index bee2e00a48..dfbc92676b 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickFindFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.brick; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; @@ -51,7 +51,7 @@ public class BrickFindFeatureTest extends AbstractBrickTest { new BrickWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new BrickFindFeature(session).find(folder)); assertFalse(new BrickFindFeature(session).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new BrickDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -60,6 +60,6 @@ public class BrickFindFeatureTest extends AbstractBrickTest { new BrickTouchFeature(session).touch(new BrickWriteFeature(session), file, new TransferStatus()); assertTrue(new BrickFindFeature(session).find(file)); assertFalse(new BrickFindFeature(session).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickMoveFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickMoveFeatureTest.java index e0cd6a112a..27c3e0c1f6 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickMoveFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickMoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.brick; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -60,7 +60,7 @@ public class BrickMoveFeatureTest extends AbstractBrickTest { assertEquals(test.attributes().getModificationDate(), targetAttr.getModificationDate()); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, test.attributes(), targetAttr)); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, target.attributes(), targetAttr)); - new BrickDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -72,7 +72,7 @@ public class BrickMoveFeatureTest extends AbstractBrickTest { assertFalse(new BrickFindFeature(session).find(test)); assertTrue(new BrickFindFeature(session).find(target)); assertEquals(test.attributes(), target.attributes()); - new BrickDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -85,7 +85,7 @@ public class BrickMoveFeatureTest extends AbstractBrickTest { assertTrue(new BrickFindFeature(session).find(test)); assertTrue(new BrickFindFeature(session).find(target)); assertEquals(test.attributes(), target.attributes()); - new BrickDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -96,7 +96,7 @@ public class BrickMoveFeatureTest extends AbstractBrickTest { IOUtils.write(random, local.getOutputStream(false)); final TransferStatus status = new TransferStatus().setLength(random.length); new BrickUploadFeature(session).upload(new BrickWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); local.delete(); final String lock = new BrickLockFeature(session).lock(test); final Path target = new BrickMoveFeature(session).move(test, @@ -104,7 +104,7 @@ public class BrickMoveFeatureTest extends AbstractBrickTest { assertFalse(new BrickFindFeature(session).find(test)); assertTrue(new BrickFindFeature(session).find(target)); assertEquals(test.attributes(), target.attributes()); - new BrickDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -118,7 +118,7 @@ public class BrickMoveFeatureTest extends AbstractBrickTest { assertFalse(new BrickFindFeature(session).find(test)); assertTrue(new BrickFindFeature(session).find(target)); assertTrue(new BrickFindFeature(session).find(targetFile)); - new BrickDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -130,7 +130,7 @@ public class BrickMoveFeatureTest extends AbstractBrickTest { new BrickMoveFeature(session).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new BrickFindFeature(session).find(test)); assertTrue(new BrickFindFeature(session).find(target)); - new BrickDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickMultipartWriteFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickMultipartWriteFeatureTest.java index 06e2894a66..7a2900f1c2 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickMultipartWriteFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickMultipartWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.brick; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.brick.io.swagger.client.model.FileEntity; @@ -69,7 +69,7 @@ public class BrickMultipartWriteFeatureTest extends AbstractBrickTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -97,7 +97,7 @@ public class BrickMultipartWriteFeatureTest extends AbstractBrickTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -125,7 +125,7 @@ public class BrickMultipartWriteFeatureTest extends AbstractBrickTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -149,6 +149,6 @@ public class BrickMultipartWriteFeatureTest extends AbstractBrickTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickReadFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickReadFeatureTest.java index 10990b9af4..9908762923 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickReadFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickReadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.brick; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.brick.io.swagger.client.model.FileEntity; @@ -58,7 +58,7 @@ public class BrickReadFeatureTest extends AbstractBrickTest { new BrickReadFeature(session).read(new Path(room, "nosuchname", EnumSet.of(Path.Type.file)), status, ConnectionCallback.noop); } finally { - new BrickDeleteFeature(session).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -87,7 +87,7 @@ public class BrickReadFeatureTest extends AbstractBrickTest { assertNotNull(in); in.close(); } - new BrickDeleteFeature(session).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -119,7 +119,7 @@ public class BrickReadFeatureTest extends AbstractBrickTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new BrickDeleteFeature(session).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -151,7 +151,7 @@ public class BrickReadFeatureTest extends AbstractBrickTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new BrickDeleteFeature(session).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -170,6 +170,6 @@ public class BrickReadFeatureTest extends AbstractBrickTest { final CountingInputStream in = new CountingInputStream(new BrickReadFeature(session).read(test, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new BrickDeleteFeature(session).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickSessionTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickSessionTest.java index 01b9713a38..ca9f2ab503 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickSessionTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickSessionTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.brick; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.exception.ConnectionCanceledException; @@ -55,7 +55,7 @@ public class BrickSessionTest extends AbstractBrickTest { } }; final BrickSession session = new BrickSession(host, new DefaultX509TrustManager(), new DefaultX509KeyManager()); - session.pair(host, ConnectionCallback.noop, new DisabledLoginCallback(), CancelCallback.noop, + session.pair(host, ConnectionCallback.noop, LoginCallback.noop, CancelCallback.noop, "t", "m", new BrowserLauncher() { @Override public boolean open(final String url) { diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickThresholdUploadFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickThresholdUploadFeatureTest.java index 84a38f4388..1a3d0cafcd 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickThresholdUploadFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickThresholdUploadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.brick; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -55,7 +55,7 @@ public class BrickThresholdUploadFeatureTest extends AbstractBrickTest { status.setLength(content.length); final BytecountStreamListener count = new BytecountStreamListener(); feature.upload(new BrickWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(content.length, count.getSent()); assertTrue(new BrickFindFeature(session).find(test)); final PathAttributes attributes = new BrickAttributesFinderFeature(session).find(test); @@ -63,7 +63,7 @@ public class BrickThresholdUploadFeatureTest extends AbstractBrickTest { final byte[] compare = new byte[length]; IOUtils.readFully(new BrickReadFeature(session).read(test, new TransferStatus().setLength(length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -81,7 +81,7 @@ public class BrickThresholdUploadFeatureTest extends AbstractBrickTest { status.setLength(content.length); final BytecountStreamListener count = new BytecountStreamListener(); feature.upload(new BrickWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(content.length, count.getSent()); assertTrue(status.isComplete()); assertTrue(new BrickFindFeature(session).find(test)); @@ -90,7 +90,7 @@ public class BrickThresholdUploadFeatureTest extends AbstractBrickTest { final byte[] compare = new byte[length]; IOUtils.readFully(new BrickReadFeature(session).read(test, new TransferStatus().setLength(length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickTimestampFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickTimestampFeatureTest.java index 8fac18dfc7..ef39ddd8b0 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickTimestampFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickTimestampFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.brick; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -47,7 +47,7 @@ public class BrickTimestampFeatureTest extends AbstractBrickTest { assertEquals(5000L, attr.getModificationDate()); assertEquals(attr, status.getResponse()); assertEquals(5000L, new DefaultAttributesFinderFeature(session).find(file).getModificationDate()); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -57,7 +57,7 @@ public class BrickTimestampFeatureTest extends AbstractBrickTest { new BrickTimestampFeature(session).setTimestamp(file, 5000L); assertEquals(5000L, new BrickAttributesFinderFeature(session).find(file).getModificationDate()); assertEquals(5000L, new DefaultAttributesFinderFeature(session).find(file).getModificationDate()); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickUploadFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickUploadFeatureTest.java index f225a73e58..873cafea1d 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickUploadFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickUploadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.brick; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -57,7 +57,7 @@ public class BrickUploadFeatureTest extends AbstractBrickTest { status.setMime("text/plain"); final BytecountStreamListener count = new BytecountStreamListener(); feature.upload(new BrickWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(content.length, count.getSent()); assertTrue(status.isComplete()); assertNotSame(PathAttributes.EMPTY, status.getResponse()); @@ -67,7 +67,7 @@ public class BrickUploadFeatureTest extends AbstractBrickTest { final byte[] compare = new byte[length]; IOUtils.readFully(new BrickReadFeature(session).read(test, new TransferStatus().setLength(length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -86,7 +86,7 @@ public class BrickUploadFeatureTest extends AbstractBrickTest { status.setMime("text/plain"); final BytecountStreamListener count = new BytecountStreamListener(); feature.upload(new BrickWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(content.length, count.getSent()); assertTrue(status.isComplete()); assertNotSame(PathAttributes.EMPTY, status.getResponse()); @@ -96,7 +96,7 @@ public class BrickUploadFeatureTest extends AbstractBrickTest { final byte[] compare = new byte[length]; IOUtils.readFully(new BrickReadFeature(session).read(test, new TransferStatus().setLength(length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -122,7 +122,7 @@ public class BrickUploadFeatureTest extends AbstractBrickTest { final byte[] compare = new byte[length]; IOUtils.readFully(new BrickReadFeature(session).read(test, new TransferStatus().setLength(length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/brick/src/test/java/ch/cyberduck/core/brick/BrickWriteFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/brick/BrickWriteFeatureTest.java index efc26ba1ff..3085004d05 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/BrickWriteFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/BrickWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.brick; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.brick.io.swagger.client.model.FileEntity; @@ -70,7 +70,7 @@ public class BrickWriteFeatureTest extends AbstractBrickTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -97,7 +97,7 @@ public class BrickWriteFeatureTest extends AbstractBrickTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -124,7 +124,7 @@ public class BrickWriteFeatureTest extends AbstractBrickTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -147,6 +147,6 @@ public class BrickWriteFeatureTest extends AbstractBrickTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new BrickDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new BrickDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/brick/src/test/java/ch/cyberduck/core/brick/cryptomator/BrickListServiceTest.java b/brick/src/test/java/ch/cyberduck/core/brick/cryptomator/BrickListServiceTest.java index 54f85e1b23..986bd2b06d 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/cryptomator/BrickListServiceTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/cryptomator/BrickListServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.brick.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.brick.AbstractBrickTest; import ch.cyberduck.core.brick.BrickDeleteFeature; @@ -65,6 +65,6 @@ public class BrickListServiceTest extends AbstractBrickTest { new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( new CryptoWriteFeature<>(session, new BrickWriteFeature(session), cryptomator), test, new TransferStatus()); Assert.assertEquals(test, new CryptoListService(session, new BrickListService(session), cryptomator).list(vault, new DisabledListProgressListener()).get(0)); - cryptomator.getFeature(session, Delete.class, new BrickDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new BrickDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/brick/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java index 6e518e70b3..2e091357ac 100644 --- a/brick/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.brick.AbstractBrickTest; import ch.cyberduck.core.brick.BrickDeleteFeature; @@ -64,7 +64,7 @@ public class DefaultTouchFeatureTest extends AbstractBrickTest { new CryptoWriteFeature<>(session, new BrickWriteFeature(session), cryptomator), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)), status); assertEquals(TransferStatus.UNKNOWN_LENGTH, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new BrickFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new BrickDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new BrickDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -80,6 +80,6 @@ public class DefaultTouchFeatureTest extends AbstractBrickTest { new CryptoWriteFeature<>(session, new BrickWriteFeature(session), cryptomator), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)), status); assertEquals(TransferStatus.UNKNOWN_LENGTH, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new BrickDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new BrickDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/brick/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java b/brick/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java index 758af69248..7780e4b09e 100644 --- a/brick/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java +++ b/brick/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -59,13 +59,13 @@ public class CopyWorkerTest extends AbstractBrickTest { IOUtils.write(random, local.getOutputStream(false)); final TransferStatus status = new TransferStatus().setLength(random.length); new BrickUploadFeature(session).upload(new BrickWriteFeature(session), source, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new BrickFindFeature(session).find(source)); final CopyWorker worker = new CopyWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(new BrickFindFeature(session).find(source)); assertTrue(new BrickFindFeature(session).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(source, target), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(source, target), ProgressListener.noop).run(session); local.delete(); } @@ -79,7 +79,7 @@ public class CopyWorkerTest extends AbstractBrickTest { IOUtils.write(random, local.getOutputStream(false)); final TransferStatus status = new TransferStatus().setLength(random.length); new BrickUploadFeature(session).upload(new BrickWriteFeature(session), sourceFile, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new BrickFindFeature(session).find(sourceFile)); final Path targetFolder = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path targetFile = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); @@ -90,7 +90,7 @@ public class CopyWorkerTest extends AbstractBrickTest { worker.run(session); assertTrue(new BrickFindFeature(session).find(sourceFile)); assertTrue(new BrickFindFeature(session).find(targetFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); local.delete(); } @@ -105,7 +105,7 @@ public class CopyWorkerTest extends AbstractBrickTest { IOUtils.write(random, local.getOutputStream(false)); final TransferStatus status = new TransferStatus().setLength(random.length); new BrickUploadFeature(session).upload(new BrickWriteFeature(session), sourceFile, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new BrickFindFeature(session).find(folder)); assertTrue(new BrickFindFeature(session).find(sourceFile)); final Path targetFolder = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); @@ -116,7 +116,7 @@ public class CopyWorkerTest extends AbstractBrickTest { assertTrue(new BrickFindFeature(session).find(targetFile)); assertTrue(new BrickFindFeature(session).find(folder)); assertTrue(new BrickFindFeature(session).find(sourceFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(folder, targetFile), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(folder, targetFile), ProgressListener.noop).run(session); local.delete(); } } diff --git a/core/src/main/java/ch/cyberduck/core/LoginCallback.java b/core/src/main/java/ch/cyberduck/core/LoginCallback.java index 0ed1ae6f2e..8d3e65c5fc 100644 --- a/core/src/main/java/ch/cyberduck/core/LoginCallback.java +++ b/core/src/main/java/ch/cyberduck/core/LoginCallback.java @@ -21,6 +21,7 @@ package ch.cyberduck.core; import ch.cyberduck.core.exception.LoginCanceledException; public interface LoginCallback extends ConnectionCallback { + LoginCallback noop = new DisabledLoginCallback(); /** * Call this to allow the user to reenter the new login credentials. diff --git a/core/src/main/java/ch/cyberduck/core/LoginCallbackFactory.java b/core/src/main/java/ch/cyberduck/core/LoginCallbackFactory.java index da8d83f825..444b6747f2 100644 --- a/core/src/main/java/ch/cyberduck/core/LoginCallbackFactory.java +++ b/core/src/main/java/ch/cyberduck/core/LoginCallbackFactory.java @@ -50,7 +50,7 @@ public class LoginCallbackFactory extends Factory { } catch(InstantiationException | InvocationTargetException | IllegalAccessException | NoSuchMethodException e) { log.error("Failure loading callback class {}. {}", clazz, e.getMessage()); - return new DisabledLoginCallback(); + return LoginCallback.noop; } } diff --git a/core/src/main/java/ch/cyberduck/core/diagnostics/HttpReachability.java b/core/src/main/java/ch/cyberduck/core/diagnostics/HttpReachability.java index 39c9382c4c..7233e1a642 100644 --- a/core/src/main/java/ch/cyberduck/core/diagnostics/HttpReachability.java +++ b/core/src/main/java/ch/cyberduck/core/diagnostics/HttpReachability.java @@ -20,10 +20,10 @@ import ch.cyberduck.core.CertificateStoreFactory; import ch.cyberduck.core.DefaultIOExceptionMappingService; import ch.cyberduck.core.DisabledCertificateIdentityCallback; import ch.cyberduck.core.DisabledCertificateTrustCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledTranscriptListener; import ch.cyberduck.core.Host; import ch.cyberduck.core.HostUrlProvider; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.ConnectionCanceledException; import ch.cyberduck.core.http.DefaultHttpResponseExceptionMappingService; @@ -84,7 +84,7 @@ public class HttpReachability implements Reachability { final HttpConnectionPoolBuilder builder = new HttpConnectionPoolBuilder(bookmark, new ThreadLocalHostnameDelegatingTrustManager(trust, bookmark.getHostname()), key, Reachability.timeout, proxy); final HttpClientBuilder configuration = builder.build(proxy, - new DisabledTranscriptListener(), new DisabledLoginCallback()); + new DisabledTranscriptListener(), LoginCallback.noop); configuration.disableRedirectHandling(); configuration.disableAutomaticRetries(); try (CloseableHttpClient client = configuration.build()) { diff --git a/core/src/main/java/ch/cyberduck/core/editor/EditOpenWorker.java b/core/src/main/java/ch/cyberduck/core/editor/EditOpenWorker.java index e053912cde..634cc3063e 100644 --- a/core/src/main/java/ch/cyberduck/core/editor/EditOpenWorker.java +++ b/core/src/main/java/ch/cyberduck/core/editor/EditOpenWorker.java @@ -18,11 +18,11 @@ package ch.cyberduck.core.editor; */ import ch.cyberduck.core.DefaultIOExceptionMappingService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.ListProgressListener; import ch.cyberduck.core.Local; import ch.cyberduck.core.LocaleFactory; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.Session; @@ -100,7 +100,7 @@ public class EditOpenWorker extends Worker { final SingleTransferWorker worker = new SingleTransferWorker(session, session, download, options, new TransferSpeedometer(download), new DisabledTransferPrompt(), new DisabledTransferErrorCallback(), - listener, StreamListener.noop, new DisabledLoginCallback(), notification); + listener, StreamListener.noop, LoginCallback.noop, notification); worker.run(session); if(!download.isComplete()) { log.warn("File size changed for {}", file); diff --git a/core/src/main/java/ch/cyberduck/core/editor/EditSaveWorker.java b/core/src/main/java/ch/cyberduck/core/editor/EditSaveWorker.java index ed23fc836b..948237aa2f 100644 --- a/core/src/main/java/ch/cyberduck/core/editor/EditSaveWorker.java +++ b/core/src/main/java/ch/cyberduck/core/editor/EditSaveWorker.java @@ -17,11 +17,11 @@ package ch.cyberduck.core.editor; * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch */ -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.ListProgressListener; import ch.cyberduck.core.Local; import ch.cyberduck.core.LocaleFactory; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -84,7 +84,7 @@ public class EditSaveWorker extends Worker { final SingleTransferWorker worker = new SingleTransferWorker(session, session, upload, new TransferOptions(), new TransferSpeedometer(upload), new DisabledTransferPrompt(), callback, - listener, StreamListener.noop, new DisabledLoginCallback(), notification); + listener, StreamListener.noop, LoginCallback.noop, notification); worker.run(session); if(!upload.isComplete()) { log.warn("File size changed for {}", file); diff --git a/core/src/test/java/ch/cyberduck/core/KeychainLoginServiceTest.java b/core/src/test/java/ch/cyberduck/core/KeychainLoginServiceTest.java index 217a7f9018..b6e18f0cc6 100644 --- a/core/src/test/java/ch/cyberduck/core/KeychainLoginServiceTest.java +++ b/core/src/test/java/ch/cyberduck/core/KeychainLoginServiceTest.java @@ -27,7 +27,7 @@ public class KeychainLoginServiceTest { throw new LoginCanceledException(); } }; - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); LoginService l = new KeychainLoginService(new DisabledPasswordStore()); l.authenticate(session, new ProgressListener() { int i = 0; @@ -45,7 +45,7 @@ public class KeychainLoginServiceTest { } i++; } - }, new DisabledLoginCallback(), CancelCallback.noop); + }, LoginCallback.noop, CancelCallback.noop); } @@ -53,7 +53,7 @@ public class KeychainLoginServiceTest { public void testCancel() throws Exception { LoginService l = new KeychainLoginService(new DisabledPasswordStore()); l.validate(new Host(new TestProtocol(), "h"), - new DefaultX509KeyManager(), new DisabledLoginCallback(), new LoginOptions()); + new DefaultX509KeyManager(), LoginCallback.noop, new LoginOptions()); } @Test @@ -70,7 +70,7 @@ public class KeychainLoginServiceTest { final Credentials credentials = new Credentials(); credentials.setUsername("u"); final Host host = new Host(new TestProtocol(), "test.cyberduck.ch", credentials); - l.validate(host, new DefaultX509KeyManager(), new DisabledLoginCallback(), new LoginOptions(host.getProtocol())); + l.validate(host, new DefaultX509KeyManager(), LoginCallback.noop, new LoginOptions(host.getProtocol())); assertTrue(keychain.get()); assertFalse(host.getCredentials().isSaved()); assertEquals("P", host.getCredentials().getPassword()); diff --git a/core/src/test/java/ch/cyberduck/core/LoginConnectionServiceTest.java b/core/src/test/java/ch/cyberduck/core/LoginConnectionServiceTest.java index b18719ce92..d07f6967b6 100644 --- a/core/src/test/java/ch/cyberduck/core/LoginConnectionServiceTest.java +++ b/core/src/test/java/ch/cyberduck/core/LoginConnectionServiceTest.java @@ -28,7 +28,7 @@ public class LoginConnectionServiceTest { return false; } }; - final LoginConnectionService s = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop, + final LoginConnectionService s = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop, new DisabledProxyFinder() { @Override public Proxy find(final String target) { @@ -46,7 +46,7 @@ public class LoginConnectionServiceTest { return false; } }; - final LoginConnectionService s = new LoginConnectionService(new DisabledLoginCallback(), new HostKeyCallback() { + final LoginConnectionService s = new LoginConnectionService(LoginCallback.noop, new HostKeyCallback() { @Override public boolean verify(final Host hostname, final PublicKey key) { assertEquals(Session.State.opening, session.getState()); @@ -81,7 +81,7 @@ public class LoginConnectionServiceTest { @Test(expected = ConnectionCanceledException.class) public void testNoHostname() throws Exception { - final LoginConnectionService s = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), new DisabledPasswordStore(), + final LoginConnectionService s = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); s.check(new NullSession(new Host(new TestProtocol(), "")), CancelCallback.noop); } diff --git a/core/src/test/java/ch/cyberduck/core/TestLoginConnectionService.java b/core/src/test/java/ch/cyberduck/core/TestLoginConnectionService.java index 14a41d32f9..b85ec92f16 100644 --- a/core/src/test/java/ch/cyberduck/core/TestLoginConnectionService.java +++ b/core/src/test/java/ch/cyberduck/core/TestLoginConnectionService.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.threading.CancelCallback; public class TestLoginConnectionService extends LoginConnectionService { public TestLoginConnectionService() { - super(new DisabledLoginCallback(), new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); + super(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); } @Override diff --git a/core/src/test/java/ch/cyberduck/core/profiles/RemoteProfilesFinderTest.java b/core/src/test/java/ch/cyberduck/core/profiles/RemoteProfilesFinderTest.java index 2359589e30..94d7a4202b 100644 --- a/core/src/test/java/ch/cyberduck/core/profiles/RemoteProfilesFinderTest.java +++ b/core/src/test/java/ch/cyberduck/core/profiles/RemoteProfilesFinderTest.java @@ -16,9 +16,9 @@ package ch.cyberduck.core.profiles; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.HostParser; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullSession; import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.Scheme; @@ -92,7 +92,7 @@ public class RemoteProfilesFinderTest { }; final Host host = new HostParser(protocols, protocol).get("https://svn.cyberduck.io/trunk/profiles"); final NullSession session = new NullSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); final RemoteProfilesFinder finder = new RemoteProfilesFinder(session); final Set stream = finder.find(); assertTrue(stream.isEmpty()); diff --git a/core/src/test/java/ch/cyberduck/core/serializer/TransferDictionaryTest.java b/core/src/test/java/ch/cyberduck/core/serializer/TransferDictionaryTest.java index b67ca09d5f..22f047a84a 100755 --- a/core/src/test/java/ch/cyberduck/core/serializer/TransferDictionaryTest.java +++ b/core/src/test/java/ch/cyberduck/core/serializer/TransferDictionaryTest.java @@ -16,10 +16,10 @@ package ch.cyberduck.core.serializer; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Filter; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullLocal; import ch.cyberduck.core.NullSession; import ch.cyberduck.core.NullTransferSession; @@ -166,7 +166,7 @@ public class TransferDictionaryTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()).run(session); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()).run(session); assertTrue(t.isComplete()); final Transfer serialized = new TransferDictionary<>().deserialize(t.serialize(SerializerFactory.get())); assertNotSame(t, serialized); diff --git a/core/src/test/java/ch/cyberduck/core/transfer/DownloadTransferTest.java b/core/src/test/java/ch/cyberduck/core/transfer/DownloadTransferTest.java index ad1c29ee98..6efaaae392 100755 --- a/core/src/test/java/ch/cyberduck/core/transfer/DownloadTransferTest.java +++ b/core/src/test/java/ch/cyberduck/core/transfer/DownloadTransferTest.java @@ -3,10 +3,10 @@ package ch.cyberduck.core.transfer; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.ListProgressListener; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullLocal; import ch.cyberduck.core.NullSession; import ch.cyberduck.core.NullTransferSession; @@ -130,7 +130,7 @@ public class DownloadTransferTest { final Transfer transfer = new DownloadTransfer(new Host(new TestProtocol()), test, new NullLocal(UUID.randomUUID().toString(), "transfer")); final SingleTransferWorker worker = new SingleTransferWorker(session, null, transfer, new TransferOptions(), new TransferSpeedometer(transfer), new DisabledTransferPrompt(), new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()); worker.prepare(test, new NullLocal(System.getProperty("java.io.tmpdir"), "c"), new TransferStatus().setExists(true), TransferAction.overwrite ); @@ -161,7 +161,7 @@ public class DownloadTransferTest { return null; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()); worker.prepare(test, testLocal, new TransferStatus().setExists(true), TransferAction.overwrite ); @@ -207,7 +207,7 @@ public class DownloadTransferTest { return null; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()); worker.prepare(test, local, new TransferStatus().setExists(true), TransferAction.resume); final TransferStatus status = new TransferStatus(); diff --git a/core/src/test/java/ch/cyberduck/core/transfer/UploadTransferTest.java b/core/src/test/java/ch/cyberduck/core/transfer/UploadTransferTest.java index b8a1b0c29d..635bd1d89f 100755 --- a/core/src/test/java/ch/cyberduck/core/transfer/UploadTransferTest.java +++ b/core/src/test/java/ch/cyberduck/core/transfer/UploadTransferTest.java @@ -174,7 +174,7 @@ public class UploadTransferTest { return null; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()).run(session); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()).run(session); assertEquals(1, c1.get()); assertEquals(1, c2.get()); assertTrue(cache.isCached(root.getParent())); @@ -257,7 +257,7 @@ public class UploadTransferTest { return TransferAction.rename; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()).run(session); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()).run(session); assertEquals(1, c1.get()); assertEquals(0, c2.get()); assertTrue(cache.isCached(root.getParent())); @@ -293,7 +293,7 @@ public class UploadTransferTest { return null; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()); worker.prepare(test, new Local(System.getProperty("java.io.tmpdir"), directoryname), new TransferStatus().setExists(true), TransferAction.overwrite); assertEquals(new TransferStatus().setExists(true).setLength(0L), worker.getStatus().get(new TransferItem(test, local))); @@ -337,7 +337,7 @@ public class UploadTransferTest { return null; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()); + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()); worker.prepare(testDirectory, localDirectory, new TransferStatus().setExists(true), TransferAction.resume); assertEquals(new TransferStatus().setExists(true).setLength(0L), worker.getStatus().get(new TransferItem(testDirectory, localDirectory))); @@ -428,7 +428,7 @@ public class UploadTransferTest { return null; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { @Override public Future transfer(final TransferItem item, final TransferAction action) throws BackgroundException { return super.transfer(item, action); diff --git a/core/src/test/java/ch/cyberduck/core/worker/ConcurrentTransferWorkerTest.java b/core/src/test/java/ch/cyberduck/core/worker/ConcurrentTransferWorkerTest.java index 4b5dc49cf7..ab77f1dc25 100644 --- a/core/src/test/java/ch/cyberduck/core/worker/ConcurrentTransferWorkerTest.java +++ b/core/src/test/java/ch/cyberduck/core/worker/ConcurrentTransferWorkerTest.java @@ -17,11 +17,11 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.DisabledTranscriptListener; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.NullLocal; import ch.cyberduck.core.Path; @@ -100,7 +100,7 @@ public class ConcurrentTransferWorkerTest { final ConcurrentTransferWorker worker = new ConcurrentTransferWorker( pool, SessionPool.DISCONNECTED, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt(), new DisabledTransferErrorCallback(), - new DisabledLoginCallback(), ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() + LoginCallback.noop, ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() ); assertNotSame(worker.borrow(ConcurrentTransferWorker.Connection.source), worker.borrow(ConcurrentTransferWorker.Connection.source)); worker.cleanup(true); @@ -118,7 +118,7 @@ public class ConcurrentTransferWorkerTest { new DisabledTranscriptListener(), host); final ConcurrentTransferWorker worker = new ConcurrentTransferWorker( pool.withMaxTotal(1), SessionPool.DISCONNECTED, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt(), new DisabledTransferErrorCallback(), - new DisabledLoginCallback(), ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() + LoginCallback.noop, ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() ); // Override default transfer queue size pool.withMaxTotal(1); @@ -209,7 +209,7 @@ public class ConcurrentTransferWorkerTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - new DisabledLoginCallback(), ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() + LoginCallback.noop, ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() ); pool.withMaxTotal(connections); final Session session = worker.borrow(ConcurrentTransferWorker.Connection.source); @@ -232,7 +232,7 @@ public class ConcurrentTransferWorkerTest { new DefaultSessionPool(connection, new DisabledX509TrustManager(), new DefaultX509KeyManager(), new DefaultVaultRegistry(new DisabledPasswordCallback()), new DisabledTranscriptListener(), host), SessionPool.DISCONNECTED, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt(), new DisabledTransferErrorCallback(), - new DisabledLoginCallback(), ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() + LoginCallback.noop, ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() ); final Session session = worker.borrow(ConcurrentTransferWorker.Connection.source); assertNotNull(session); @@ -263,7 +263,7 @@ public class ConcurrentTransferWorkerTest { new DefaultSessionPool(connection, new DisabledX509TrustManager(), new DefaultX509KeyManager(), new DefaultVaultRegistry(new DisabledPasswordCallback()), new DisabledTranscriptListener(), host), SessionPool.DISCONNECTED, transfer, new TransferOptions(), new TransferSpeedometer(transfer), new DisabledTransferPrompt(), new DisabledTransferErrorCallback(), - new DisabledLoginCallback(), ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() + LoginCallback.noop, ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() ); int workers = 1000; final CountDownLatch entry = new CountDownLatch(workers); diff --git a/core/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java b/core/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java index 2c299e30fa..abc41fbf60 100644 --- a/core/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java +++ b/core/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java @@ -2,9 +2,9 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AttributedList; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullSession; import ch.cyberduck.core.PasswordCallback; import ch.cyberduck.core.Path; @@ -64,7 +64,7 @@ public class DeleteWorkerTest { return null; } }; - final DeleteWorker worker = new DeleteWorker(new DisabledLoginCallback(), + final DeleteWorker worker = new DeleteWorker(LoginCallback.noop, Collections.singletonList(new Path("/t", EnumSet.of(Path.Type.directory))), ProgressListener.noop); int hashCode = worker.hashCode(); @@ -112,7 +112,7 @@ public class DeleteWorkerTest { return null; } }; - final DeleteWorker worker = new DeleteWorker(new DisabledLoginCallback(), + final DeleteWorker worker = new DeleteWorker(LoginCallback.noop, Collections.singletonList(new Path("/t", EnumSet.of(Path.Type.directory))), ProgressListener.noop); assertEquals(1, worker.run(session).size()); @@ -158,7 +158,7 @@ public class DeleteWorkerTest { return null; } }; - final DeleteWorker worker = new DeleteWorker(new DisabledLoginCallback(), + final DeleteWorker worker = new DeleteWorker(LoginCallback.noop, Arrays.asList( new Path("/t", EnumSet.of(Path.Type.directory)), new Path("/t/a", EnumSet.of(Path.Type.file)), @@ -193,7 +193,7 @@ public class DeleteWorkerTest { return null; } }; - final DeleteWorker worker = new DeleteWorker(new DisabledLoginCallback(), + final DeleteWorker worker = new DeleteWorker(LoginCallback.noop, Collections.singletonList(new Path("/s", EnumSet.of(Path.Type.directory, AbstractPath.Type.symboliclink))), ProgressListener.noop); worker.run(session); diff --git a/core/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java b/core/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java index f25c9c8bef..ec2bd3f9d6 100644 --- a/core/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java +++ b/core/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullSession; import ch.cyberduck.core.PasswordCallback; import ch.cyberduck.core.Path; @@ -147,7 +147,7 @@ public class MoveWorkerTest { }; final MoveWorker worker = new MoveWorker( Collections.singletonMap(new Path("/t", EnumSet.of(Path.Type.directory)), new Path("/t2", EnumSet.of(Path.Type.directory))), - new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); final Collection targets = worker.run(session).values(); assertEquals(4, targets.size()); assertTrue(targets.contains(new Path("/t2", EnumSet.of(Path.Type.directory)))); diff --git a/core/src/test/java/ch/cyberduck/core/worker/SingleTransferWorkerTest.java b/core/src/test/java/ch/cyberduck/core/worker/SingleTransferWorkerTest.java index fbea294f2e..6ea566b5b7 100644 --- a/core/src/test/java/ch/cyberduck/core/worker/SingleTransferWorkerTest.java +++ b/core/src/test/java/ch/cyberduck/core/worker/SingleTransferWorkerTest.java @@ -2,10 +2,10 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.ListProgressListener; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullLocal; import ch.cyberduck.core.NullSession; import ch.cyberduck.core.Path; @@ -81,7 +81,7 @@ public class SingleTransferWorkerTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { @Override public Future transfer(final TransferItem item, final TransferAction action) throws BackgroundException { if(item.remote.equals(root)) { @@ -151,7 +151,7 @@ public class SingleTransferWorkerTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { @Override public Future transfer(final TransferItem item, final TransferAction action) throws BackgroundException { if(item.remote.equals(root)) { @@ -216,7 +216,7 @@ public class SingleTransferWorkerTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { @Override public Future transfer(final TransferItem item, final TransferAction action) throws BackgroundException { if(item.remote.equals(root)) { @@ -260,7 +260,7 @@ public class SingleTransferWorkerTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { @Override public Future transfer(final TransferItem file, final TransferAction action) { // Expected not found diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/AbstractCteraDirectIOTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/AbstractCteraDirectIOTest.java index 8771d90d7f..03401b2da1 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/AbstractCteraDirectIOTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/AbstractCteraDirectIOTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.ctera; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.preferences.PreferencesFactory; @@ -54,7 +54,7 @@ public class AbstractCteraDirectIOTest extends VaultTest { host.setDefaultPath("/ServicesPortal/webdav/My Files"); PreferencesFactory.get().setDefault("ctera.download.directio.enable", String.valueOf(true)); session = new CteraSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager(), new TestPasswordStore()); - final LoginConnectionService connect = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), + final LoginConnectionService connect = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new TestPasswordStore(), ProgressListener.noop, new DisabledProxyFinder()); connect.check(session, CancelCallback.noop); } diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraAttributesFinderFeatureTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraAttributesFinderFeatureTest.java index 05284b9738..a8c6061bf6 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraAttributesFinderFeatureTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraAttributesFinderFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -85,7 +85,7 @@ public class CteraAttributesFinderFeatureTest extends AbstractCteraTest { assertEquals(attributes, new CteraListService(session).list(folder, new DisabledListProgressListener()).find(new SimplePathPredicate(test)).attributes()); // Test wrong type assertThrows(NotfoundException.class, () -> f.find(new Path(test.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraConcurrentTransferWorkerTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraConcurrentTransferWorkerTest.java index 17c97f800f..e3c1fefd93 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraConcurrentTransferWorkerTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraConcurrentTransferWorkerTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.ctera; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -83,7 +83,7 @@ public class CteraConcurrentTransferWorkerTest extends AbstractCteraDirectIOTest }, new DisabledTransferErrorCallback(), ConnectionCallback.noop, ProgressListener.noop, bytecount, new DisabledNotificationService()).run(session)); assertArrayEquals(content, IOUtils.toByteArray(localFile.getInputStream())); assertEquals(content.length, bytecount.getRecv()); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); localFile.delete(); } @@ -111,7 +111,7 @@ public class CteraConcurrentTransferWorkerTest extends AbstractCteraDirectIOTest }, new DisabledTransferErrorCallback(), ConnectionCallback.noop, ProgressListener.noop, bytecount, new DisabledNotificationService()).run(session)); assertArrayEquals(content, IOUtils.toByteArray(localFile.getInputStream())); assertEquals(content.length, bytecount.getRecv()); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); localFile.delete(); } diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDeleteFeatureTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDeleteFeatureTest.java index efa2206f7c..275ba047af 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDeleteFeatureTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDeleteFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.ctera; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.dav.DAVFindFeature; import ch.cyberduck.core.dav.DAVLockFeature; @@ -33,7 +33,7 @@ public class CteraDeleteFeatureTest extends AbstractCteraTest { final Path test = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new CteraTouchFeature(session).touch(new CteraWriteFeature(session), test, new TransferStatus()); assertTrue(new DAVFindFeature(session).find(test)); - new CteraDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DAVFindFeature(session).find(test)); } @@ -49,7 +49,7 @@ public class CteraDeleteFeatureTest extends AbstractCteraTest { // Not supported } assertTrue(new DAVFindFeature(session).find(test)); - new CteraDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus().setLockId(lock)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus().setLockId(lock)), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DAVFindFeature(session).find(test)); } @@ -59,14 +59,14 @@ public class CteraDeleteFeatureTest extends AbstractCteraTest { new CteraDirectoryFeature(session).mkdir(new CteraWriteFeature(session), test, new TransferStatus()); assertTrue(new DAVFindFeature(session).find(test)); new CteraTouchFeature(session).touch(new CteraWriteFeature(session), new Path(test, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); - new CteraDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DAVFindFeature(session).find(test)); } @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new CteraDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDirectIOReadFeatureTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDirectIOReadFeatureTest.java index cc35dc3b5e..3958017e75 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDirectIOReadFeatureTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDirectIOReadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.ctera; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultVersionIdProvider; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -77,7 +77,7 @@ public class CteraDirectIOReadFeatureTest extends AbstractCteraDirectIOTest { new StreamCopier(segment, segment).transfer(in, buffer); in.close(); assertArrayEquals(content, buffer.toByteArray()); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -108,6 +108,6 @@ public class CteraDirectIOReadFeatureTest extends AbstractCteraDirectIOTest { new StreamCopier(status, status).transfer(in, buffer); in.close(); assertArrayEquals(content, buffer.toByteArray()); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDirectoryFeatureTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDirectoryFeatureTest.java index a180b0837b..2bcf015cf7 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDirectoryFeatureTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraDirectoryFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.ctera; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.AccessDeniedException; import ch.cyberduck.core.exception.ConflictException; @@ -46,7 +46,7 @@ public class CteraDirectoryFeatureTest extends AbstractCteraTest { final Path result = new CteraDirectoryFeature(session).mkdir(new CteraWriteFeature(session), test, new TransferStatus()); assertTrue(session.getFeature(Find.class).find(test)); assertThrows(ConflictException.class, () -> new CteraDirectoryFeature(session).mkdir(new CteraWriteFeature(session), test, new TransferStatus())); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); } diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraMoveFeatureTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraMoveFeatureTest.java index 10fcb61f94..2a3730cc10 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraMoveFeatureTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraMoveFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.LocaleFactory; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.dav.DAVFindFeature; @@ -73,7 +73,7 @@ public class CteraMoveFeatureTest extends AbstractCteraTest { assertEquals(attr, new CteraAttributesFinderFeature(session).find(target)); assertEquals(Comparison.equal, new ETagComparisonService().compare(Path.Type.file, attr, new CteraAttributesFinderFeature(session).find(target))); assertEquals(Comparison.equal, new ETagComparisonService().compare(Path.Type.file, attr, status.getResponse())); - new CteraDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -102,7 +102,7 @@ public class CteraMoveFeatureTest extends AbstractCteraTest { assertEquals(attr.getModificationDate(), new CteraAttributesFinderFeature(session).find(new Path(target, test.getName(), EnumSet.of(Path.Type.file))).getModificationDate()); assertEquals(attr.getFileId(), new CteraAttributesFinderFeature(session).find(new Path(target, test.getName(), EnumSet.of(Path.Type.file))).getFileId()); // N.B. ETag should remain constant when moving a resource but Ctera may not be WebDAV compliant. - new CteraDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -121,7 +121,7 @@ public class CteraMoveFeatureTest extends AbstractCteraTest { assertTrue(new DAVFindFeature(session).find(target)); assertEquals(testAttributes, new CteraAttributesFinderFeature(session).find(target)); assertEquals(Comparison.equal, new ETagComparisonService().compare(Path.Type.file, testAttributes, new CteraAttributesFinderFeature(session).find(target))); - new CteraDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraReadFeatureTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraReadFeatureTest.java index 0d6bd00239..72e0326e7f 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraReadFeatureTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraReadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.ctera; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.dav.DAVUploadFeature; @@ -89,9 +89,9 @@ public class CteraReadFeatureTest extends AbstractCteraTest { } }; new DefaultDownloadFeature(session).download(new CteraReadFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - StreamListener.noop, status, new DisabledLoginCallback()); + StreamListener.noop, status, LoginCallback.noop); assertEquals(923L, local.attributes().getSize()); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -111,7 +111,7 @@ public class CteraReadFeatureTest extends AbstractCteraTest { assertNotNull(in); in.close(); } - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -139,7 +139,7 @@ public class CteraReadFeatureTest extends AbstractCteraTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -167,7 +167,7 @@ public class CteraReadFeatureTest extends AbstractCteraTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -178,7 +178,7 @@ public class CteraReadFeatureTest extends AbstractCteraTest { final CountingInputStream in = new CountingInputStream(new CteraReadFeature(session).read(test, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new CteraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraWriteFeatureTest.java b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraWriteFeatureTest.java index 1aa54d9f75..c57c412661 100644 --- a/ctera/src/test/java/ch/cyberduck/core/ctera/CteraWriteFeatureTest.java +++ b/ctera/src/test/java/ch/cyberduck/core/ctera/CteraWriteFeatureTest.java @@ -4,8 +4,8 @@ import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -80,7 +80,7 @@ public class CteraWriteFeatureTest extends AbstractCteraTest { // Folder ETag does not change if content changes // assertNotEquals(folderEtag, new CteraAttributesFinderFeature(session).find(folder).getETag()); assertNotEquals(rootEtag, new CteraAttributesFinderFeature(session).find(root).getETag()); - new CteraDeleteFeature(session).delete(Arrays.asList(test, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Arrays.asList(test, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -117,7 +117,7 @@ public class CteraWriteFeatureTest extends AbstractCteraTest { assertEquals(101L, attr2.getSize()); assertNotEquals(attr1.getETag(), attr2.getETag()); assertNotEquals(attr1.getModificationDate(), attr2.getModificationDate()); - new CteraDeleteFeature(session).delete(Arrays.asList(test, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new CteraDeleteFeature(session).delete(Arrays.asList(test, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxCopyFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxCopyFeatureTest.java index a7888af8d7..91cf328a9a 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxCopyFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxCopyFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.deepbox; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -53,8 +53,8 @@ public class DeepboxCopyFeatureTest extends AbstractDeepboxTest { assertTrue(new DeepboxFindFeature(session, fileid).find(copy.withAttributes(new DefaultPathAttributes()))); } finally { - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test.withAttributes(new DefaultPathAttributes())), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(copy.withAttributes(new DefaultPathAttributes())), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test.withAttributes(new DefaultPathAttributes())), LoginCallback.noop, new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(copy.withAttributes(new DefaultPathAttributes())), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -66,7 +66,7 @@ public class DeepboxCopyFeatureTest extends AbstractDeepboxTest { new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final Path copy = new Path(documents, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); assertThrows(UnsupportedException.class, () -> new DeepboxCopyFeature(session, fileid).preflight(directory, Optional.of(copy))); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(directory.withAttributes(new DefaultPathAttributes())), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(directory.withAttributes(new DefaultPathAttributes())), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -76,7 +76,7 @@ public class DeepboxCopyFeatureTest extends AbstractDeepboxTest { final Path test = new Path(documents, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); assertThrows(NotfoundException.class, () -> new DeepboxCopyFeature(session, fileid).copy(test, new Path(documents, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), - new DisabledLoginCallback(), StreamListener.noop)); + LoginCallback.noop, StreamListener.noop)); } @Test @@ -111,8 +111,8 @@ public class DeepboxCopyFeatureTest extends AbstractDeepboxTest { assertEquals(originalTargetAttributes.getModificationDate(), trashedTargetAttributes.getModificationDate()); assertEquals(originalTargetAttributes.getChecksum(), trashedTargetAttributes.getChecksum()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(targetInTrash), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(targetInTrash), LoginCallback.noop, new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxDirectoryFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxDirectoryFeatureTest.java index 1864a6ec3f..e74508acbf 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxDirectoryFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxDirectoryFeatureTest.java @@ -18,9 +18,8 @@ package ch.cyberduck.core.deepbox; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; -import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.AccessDeniedException; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.exception.InteroperabilityException; @@ -129,7 +128,7 @@ public class DeepboxDirectoryFeatureTest extends AbstractDeepboxTest { directory.mkdir(new DeepboxWriteFeature(session, nodeid), folder, new TransferStatus()); assertTrue(new DeepboxFindFeature(session, nodeid).find(folder.withAttributes(new DefaultPathAttributes()), new DisabledListProgressListener())); assertEquals(0, new DeepboxListService(session, nodeid).list(folder, new DisabledListProgressListener()).size()); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertThrows(NotfoundException.class, () -> nodeid.getFileId(folder.withAttributes(new DefaultPathAttributes()))); assertFalse(new DeepboxFindFeature(session, nodeid).find(folder.withAttributes(new DefaultPathAttributes()))); } @@ -142,7 +141,7 @@ public class DeepboxDirectoryFeatureTest extends AbstractDeepboxTest { final Path folder = new Path(parent, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); directory.mkdir(new DeepboxWriteFeature(session, nodeid), folder, new TransferStatus()); assertEquals(0, new DeepboxListService(session, nodeid).list(folder, new DisabledListProgressListener()).size()); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DeepboxFindFeature(session, nodeid).find(folder)); } @@ -153,7 +152,7 @@ public class DeepboxDirectoryFeatureTest extends AbstractDeepboxTest { final Path test = new DeepboxDirectoryFeature(session, nodeid).mkdir(new DeepboxWriteFeature(session, nodeid), new Path(documents, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); new DeepboxDirectoryFeature(session, nodeid).preflight(documents.withAttributes(new DeepboxAttributesFinderFeature(session, nodeid).find(documents)), test.getName()); assertTrue(new DeepboxFindFeature(session, nodeid).find(test)); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -165,7 +164,7 @@ public class DeepboxDirectoryFeatureTest extends AbstractDeepboxTest { directory.mkdir(new DeepboxWriteFeature(session, nodeid), folder, new TransferStatus()); assertEquals(0, new DeepboxListService(session, nodeid).list(folder, new DisabledListProgressListener()).size()); assertThrows(ConflictException.class, () -> directory.mkdir(new DeepboxWriteFeature(session, nodeid), folder, new TransferStatus())); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DeepboxFindFeature(session, nodeid).find(folder)); } } \ No newline at end of file diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxFindFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxFindFeatureTest.java index 817aca4a65..d17dc57c9f 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxFindFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.deepbox; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Home; @@ -61,7 +61,7 @@ public class DeepboxFindFeatureTest extends AbstractDeepboxTest { new DeepboxWriteFeature(session, nodeid), new Path(box, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new DeepboxFindFeature(session, nodeid).find(folder)); assertFalse(new DeepboxFindFeature(session, nodeid).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -73,6 +73,6 @@ public class DeepboxFindFeatureTest extends AbstractDeepboxTest { assertTrue(new DeepboxFindFeature(session, nodeid).find(file)); assertFalse(new DeepboxFindFeature(session, nodeid).find(new Path(box, StringUtils.upperCase(file.getName()), EnumSet.of(Path.Type.file)))); assertFalse(new DeepboxFindFeature(session, nodeid).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxListServiceTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxListServiceTest.java index 5a80593acd..911d0165ec 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxListServiceTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxListServiceTest.java @@ -20,7 +20,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -269,7 +269,7 @@ public class DeepboxListServiceTest extends AbstractDeepboxTest { assertEquals(numFiles, listing.size()); } finally { - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -291,7 +291,7 @@ public class DeepboxListServiceTest extends AbstractDeepboxTest { assertEquals(numFiles, listing.size()); } finally { - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -331,7 +331,7 @@ public class DeepboxListServiceTest extends AbstractDeepboxTest { assertTrue(nodeContent.getNodes().get(0).getNodeId().equals(nodeid.getFileId(file)) || nodeContent.getNodes().get(1).getNodeId().equals(nodeid.getFileId(file)) ); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -351,7 +351,7 @@ public class DeepboxListServiceTest extends AbstractDeepboxTest { for(Path f : new DeepboxListService(session, nodeid).list(folder, new DisabledListProgressListener())) { assertTrue(f.attributes().isDuplicate()); } - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -378,7 +378,7 @@ public class DeepboxListServiceTest extends AbstractDeepboxTest { for(Path f : new DeepboxListService(session, nodeid).list(folder, new DisabledListProgressListener())) { assertTrue(f.attributes().isDuplicate()); } - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxMoveFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxMoveFeatureTest.java index bfd6fc2ccc..346d5f6e26 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxMoveFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxMoveFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.AccessDeniedException; @@ -67,7 +67,7 @@ public class DeepboxMoveFeatureTest extends AbstractDeepboxTest { assertEquals(test.attributes().getModificationDate(), moved.attributes().getModificationDate()); assertEquals(test.attributes().getChecksum(), moved.attributes().getChecksum()); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, test.attributes(), moved.attributes())); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(moved), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(moved), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -84,7 +84,7 @@ public class DeepboxMoveFeatureTest extends AbstractDeepboxTest { assertFalse(new DeepboxFindFeature(session, fileid).find(test.withAttributes(new DefaultPathAttributes()))); assertTrue(new DeepboxFindFeature(session, fileid).find(target)); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -140,8 +140,8 @@ public class DeepboxMoveFeatureTest extends AbstractDeepboxTest { assertEquals(originalTargetAttributes.getModificationDate(), trashedTargetAttributes.getModificationDate()); assertEquals(originalTargetAttributes.getChecksum(), trashedTargetAttributes.getChecksum()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(targetInTrash), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(targetInTrash), LoginCallback.noop, new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -176,8 +176,8 @@ public class DeepboxMoveFeatureTest extends AbstractDeepboxTest { assertEquals(originalTargetAttributes.getModificationDate(), trashedTargetAttributes.getModificationDate()); assertEquals(originalTargetAttributes.getChecksum(), trashedTargetAttributes.getChecksum()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(targetInTrash), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(targetInTrash), LoginCallback.noop, new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -269,7 +269,7 @@ public class DeepboxMoveFeatureTest extends AbstractDeepboxTest { assertTrue(attributes.getAcl().get(new Acl.CanonicalUser()).contains(CANRENAME)); assertThrows(AccessDeniedException.class, () -> new DeepboxMoveFeature(session, nodeid).preflight(fileInTrash, Optional.of(file))); assertThrows(AccessDeniedException.class, () -> new DeepboxMoveFeature(session, nodeid).preflight(fileInTrash, Optional.of(new Path(trash, file.getName(), EnumSet.of(Path.Type.file))))); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInTrash), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInTrash), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -285,7 +285,7 @@ public class DeepboxMoveFeatureTest extends AbstractDeepboxTest { assertTrue(attributes.getAcl().get(new Acl.CanonicalUser()).contains(CANMOVEOUTOFBOX)); assertTrue(attributes.getAcl().get(new Acl.CanonicalUser()).contains(CANRENAME)); assertThrows(AccessDeniedException.class, () -> new DeepboxMoveFeature(session, nodeid).preflight(file, Optional.of(fileInTrash))); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxReadFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxReadFeatureTest.java index 84bab2c436..c5e98ac26a 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxReadFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxReadFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.deepbox; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.deepbox.io.swagger.client.model.Node; import ch.cyberduck.core.exception.NotfoundException; @@ -62,7 +62,7 @@ public class DeepboxReadFeatureTest extends AbstractDeepboxTest { final Path test = new DeepboxDirectoryFeature(session, nodeid).mkdir( new DeepboxWriteFeature(session, nodeid), new Path(documents, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertThrows(NotfoundException.class, () -> new DeepboxReadFeature(session, nodeid).read(new Path(test, "nosuchname", EnumSet.of(Path.Type.file)), status, ConnectionCallback.noop)); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -95,7 +95,7 @@ public class DeepboxReadFeatureTest extends AbstractDeepboxTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -128,6 +128,6 @@ public class DeepboxReadFeatureTest extends AbstractDeepboxTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxRestoreFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxRestoreFeatureTest.java index a791a40881..c7d2b9ba95 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxRestoreFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxRestoreFeatureTest.java @@ -17,9 +17,8 @@ package ch.cyberduck.core.deepbox; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; -import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.deepbox.io.swagger.client.api.CoreRestControllerApi; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.NotfoundException; @@ -52,7 +51,7 @@ public class DeepboxRestoreFeatureTest extends AbstractDeepboxTest { assertTrue(new DeepboxFindFeature(session, fileid).find(test.withAttributes(new DefaultPathAttributes()))); assertFalse(new DeepboxFindFeature(session, fileid).find(testInTrash.withAttributes(new DefaultPathAttributes()))); - new DeepboxTrashFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxTrashFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DeepboxFindFeature(session, fileid).find(test.withAttributes(new DefaultPathAttributes()))); assertTrue(new DeepboxFindFeature(session, fileid).find(testInTrash.withAttributes(new DefaultPathAttributes()))); assertEquals(nodeId, new DeepboxAttributesFinderFeature(session, fileid).find(testInTrash.withAttributes(new DefaultPathAttributes())).getFileId()); @@ -60,13 +59,13 @@ public class DeepboxRestoreFeatureTest extends AbstractDeepboxTest { assertEquals(nodeId, new DeepboxAttributesFinderFeature(session, fileid).find(testInTrash.withAttributes(new DefaultPathAttributes())).getFileId()); final DeepboxRestoreFeature restore = new DeepboxRestoreFeature(session, fileid); - restore.restore(testInTrash, new DisabledLoginCallback()); + restore.restore(testInTrash, LoginCallback.noop); assertTrue(new DeepboxFindFeature(session, fileid).find(test.withAttributes(new DefaultPathAttributes()))); assertFalse(new DeepboxFindFeature(session, fileid).find(testInTrash.withAttributes(new DefaultPathAttributes()))); assertEquals(nodeId, new DeepboxAttributesFinderFeature(session, fileid).find(test.withAttributes(new DefaultPathAttributes())).getFileId()); assertThrows(NotfoundException.class, () -> new DeepboxAttributesFinderFeature(session, fileid).find(testInTrash.withAttributes(new DefaultPathAttributes()))); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test.withAttributes(new DefaultPathAttributes())), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test.withAttributes(new DefaultPathAttributes())), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -99,7 +98,7 @@ public class DeepboxRestoreFeatureTest extends AbstractDeepboxTest { assertFalse(new DeepboxFindFeature(session, fileid).find(subfolderWithContentInTrash.withAttributes(new DefaultPathAttributes()))); assertFalse(new DeepboxFindFeature(session, fileid).find(fileInTrash.withAttributes(new DefaultPathAttributes()))); - new DeepboxTrashFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxTrashFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertThrows(NotfoundException.class, () -> fileid.getFileId(folder.withAttributes(new DefaultPathAttributes()))); assertThrows(NotfoundException.class, () -> fileid.getFileId(subfolderWithContent.withAttributes(new DefaultPathAttributes()))); @@ -115,7 +114,7 @@ public class DeepboxRestoreFeatureTest extends AbstractDeepboxTest { assertEquals(nodeId, new DeepboxAttributesFinderFeature(session, fileid).find(fileInTrash.withAttributes(new DefaultPathAttributes())).getFileId()); final DeepboxRestoreFeature restore = new DeepboxRestoreFeature(session, fileid); - restore.restore(folderInTrash, new DisabledLoginCallback()); + restore.restore(folderInTrash, LoginCallback.noop); assertTrue(new DeepboxFindFeature(session, fileid).find(folder.withAttributes(new DefaultPathAttributes()))); assertTrue(new DeepboxFindFeature(session, fileid).find(subfolderWithContent.withAttributes(new DefaultPathAttributes()))); assertTrue(new DeepboxFindFeature(session, fileid).find(file.withAttributes(new DefaultPathAttributes()))); @@ -126,6 +125,6 @@ public class DeepboxRestoreFeatureTest extends AbstractDeepboxTest { assertEquals(subFolderId, new DeepboxAttributesFinderFeature(session, fileid).find(subfolderWithContent.withAttributes(new DefaultPathAttributes())).getFileId()); assertEquals(nodeId, new DeepboxAttributesFinderFeature(session, fileid).find(file.withAttributes(new DefaultPathAttributes())).getFileId()); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(folder.withAttributes(new DefaultPathAttributes())), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(folder.withAttributes(new DefaultPathAttributes())), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxShareFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxShareFeatureTest.java index 605d1a0b64..4b91dc2a22 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxShareFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxShareFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.deepbox; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Share; @@ -48,7 +48,7 @@ public class DeepboxShareFeatureTest extends AbstractDeepboxTest { assertNotNull(feature.toDownloadUrl(test, Share.Sharee.world, null, new DisabledPasswordCallback()).getUrl()); } finally { - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } } \ No newline at end of file diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxTouchFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxTouchFeatureTest.java index 12e4f90dcc..14ac166f3a 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxTouchFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxTouchFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.deepbox; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.deepbox.io.swagger.client.api.BoxRestControllerApi; @@ -55,7 +55,7 @@ public class DeepboxTouchFeatureTest extends AbstractDeepboxTest { final Path test = new DeepboxTouchFeature(session, fileid).touch(new DeepboxWriteFeature(session, fileid), new Path(documents, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); new DeepboxTouchFeature(session, fileid).preflight(documents.withAttributes(new DeepboxAttributesFinderFeature(session, fileid).find(documents)), test.getName()); assertTrue(new DeepboxFindFeature(session, fileid).find(test)); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -64,7 +64,7 @@ public class DeepboxTouchFeatureTest extends AbstractDeepboxTest { final Path documents = new Path("/ORG 4 - DeepBox Desktop App/ORG 4 - DeepBox Desktop App/ORG3:Box1/Documents/Insurance", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path test = new DeepboxTouchFeature(session, fileid).touch(new DeepboxWriteFeature(session, fileid), new Path(documents, new AlphanumericRandomStringService().random() + "éf", EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new DeepboxFindFeature(session, fileid).find(documents)); - new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxTrashFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxTrashFeatureTest.java index f732e503d9..163eb0f135 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxTrashFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxTrashFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.deepbox; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.deepbox.io.swagger.client.ApiException; @@ -53,14 +53,14 @@ public class DeepboxTrashFeatureTest extends AbstractDeepboxTest { final String nodeId = new DeepboxAttributesFinderFeature(session, nodeid).find(file).getFileId(); new CoreRestControllerApi(session.getClient()).getNodeInfo(nodeId, null, null, null); // assert no fail assertTrue(new DeepboxFindFeature(session, nodeid).find(file)); - new DeepboxTrashFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxTrashFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DeepboxFindFeature(session, nodeid).find(file)); // file not in trash is deleted but not purged (i.e. moved to the trash) final Path fileInTrash = new Path(trash, file.getName(), EnumSet.of(Path.Type.file)); assertTrue(new DeepboxFindFeature(session, nodeid).find(fileInTrash)); assertEquals(nodeId, new DeepboxAttributesFinderFeature(session, nodeid).find(fileInTrash).getFileId()); // file in trash is purged (i.e. deleted permanently) - new DeepboxTrashFeature(session, nodeid).delete(Collections.singletonList(fileInTrash), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxTrashFeature(session, nodeid).delete(Collections.singletonList(fileInTrash), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DeepboxFindFeature(session, nodeid).find(fileInTrash)); try { new CoreRestControllerApi(session.getClient()).getNodeInfo(nodeId, null, null, null); @@ -84,7 +84,7 @@ public class DeepboxTrashFeatureTest extends AbstractDeepboxTest { final Path file = new Path(subfolderWithContent, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new DeepboxTouchFeature(session, nodeid).touch(new DeepboxWriteFeature(session, nodeid), file, new TransferStatus()); assertTrue(new DeepboxFindFeature(session, nodeid).find(file)); - new DeepboxTrashFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxTrashFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DeepboxFindFeature(session, nodeid).find(folder.withAttributes(new DefaultPathAttributes()))); assertFalse(new DefaultFindFeature(session).find(folder)); assertFalse(new DeepboxFindFeature(session, nodeid).find(subfolderWithContent.withAttributes(new DefaultPathAttributes()))); @@ -96,7 +96,7 @@ public class DeepboxTrashFeatureTest extends AbstractDeepboxTest { assertEquals(nodeId, new DeepboxAttributesFinderFeature(session, nodeid).find(folderInTrash).getFileId()); new CoreRestControllerApi(session.getClient()).getNodeInfo(nodeId, null, null, null); // assert no fail // file in trash is purged (i.e. deleted permanently) - new DeepboxTrashFeature(session, nodeid).delete(Collections.singletonList(folderInTrash), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxTrashFeature(session, nodeid).delete(Collections.singletonList(folderInTrash), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DeepboxFindFeature(session, nodeid).find(folderInTrash)); try { new CoreRestControllerApi(session.getClient()).getNodeInfo(nodeId, null, null, null); @@ -212,7 +212,7 @@ public class DeepboxTrashFeatureTest extends AbstractDeepboxTest { assertTrue(new DeepboxAttributesFinderFeature(session, nodeid).find(testInTrash).getAcl().get(new Acl.CanonicalUser()).contains(CANPURGE)); assertTrue(new DeepboxAttributesFinderFeature(session, nodeid).find(testInTrash).getAcl().get(new Acl.CanonicalUser()).contains(CANREVERT)); - new DeepboxRestoreFeature(session, nodeid).restore(testInTrash.withAttributes(new DefaultPathAttributes()), new DisabledLoginCallback()); + new DeepboxRestoreFeature(session, nodeid).restore(testInTrash.withAttributes(new DefaultPathAttributes()), LoginCallback.noop); assertTrue(new DeepboxFindFeature(session, nodeid).find(test.withAttributes(new DefaultPathAttributes()))); assertFalse(new DeepboxFindFeature(session, nodeid).find(testInTrash.withAttributes(new DefaultPathAttributes()))); assertTrue(new DeepboxAttributesFinderFeature(session, nodeid).find(test).getAcl().get(new Acl.CanonicalUser()).contains(CANDELETE)); @@ -253,7 +253,7 @@ public class DeepboxTrashFeatureTest extends AbstractDeepboxTest { assertTrue(new DeepboxAttributesFinderFeature(session, nodeid).find(testInTrash).getAcl().get(new Acl.CanonicalUser()).contains(CANPURGE)); assertTrue(new DeepboxAttributesFinderFeature(session, nodeid).find(testInTrash).getAcl().get(new Acl.CanonicalUser()).contains(CANREVERT)); - new DeepboxRestoreFeature(session, nodeid).restore(testInTrash.withAttributes(new DefaultPathAttributes()), new DisabledLoginCallback()); + new DeepboxRestoreFeature(session, nodeid).restore(testInTrash.withAttributes(new DefaultPathAttributes()), LoginCallback.noop); assertTrue(new DeepboxFindFeature(session, nodeid).find(test.withAttributes(new DefaultPathAttributes()))); assertFalse(new DeepboxFindFeature(session, nodeid).find(testInTrash.withAttributes(new DefaultPathAttributes()))); assertTrue(new DeepboxAttributesFinderFeature(session, nodeid).find(test).getAcl().get(new Acl.CanonicalUser()).contains(CANDELETE)); diff --git a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxWriteFeatureTest.java b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxWriteFeatureTest.java index 615d7ee859..602c9b5f07 100644 --- a/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxWriteFeatureTest.java +++ b/deepbox/src/test/java/ch/cyberduck/core/deepbox/DeepboxWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.deepbox; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.deepbox.io.swagger.client.model.Node; @@ -70,7 +70,7 @@ public class DeepboxWriteFeatureTest extends AbstractDeepboxTest { assertEquals(content.length, new DeepboxAttributesFinderFeature(session, nodeid).find(file).getSize()); } finally { - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -95,7 +95,7 @@ public class DeepboxWriteFeatureTest extends AbstractDeepboxTest { assertEquals(content.length, new DeepboxAttributesFinderFeature(session, nodeid).find(file).getSize()); } finally { - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -115,7 +115,7 @@ public class DeepboxWriteFeatureTest extends AbstractDeepboxTest { out.close(); assertTrue(new DefaultFindFeature(session).find(file)); assertTrue(new DeepboxFindFeature(session, nodeid).find(file)); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -164,7 +164,7 @@ public class DeepboxWriteFeatureTest extends AbstractDeepboxTest { attributes = new DeepboxAttributesFinderFeature(session, nodeid).find(test); assertNotNull(attributes.getFileId()); assertEquals(nodeId, new DeepboxIdProvider(session).getFileId(test)); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -190,8 +190,8 @@ public class DeepboxWriteFeatureTest extends AbstractDeepboxTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -221,6 +221,6 @@ public class DeepboxWriteFeatureTest extends AbstractDeepboxTest { assertThrows(TransferStatusCanceledException.class, () -> new StreamCopier(status, status).withListener(listener).transfer(new ByteArrayInputStream(content), out)); assertFalse(new DefaultFindFeature(session).find(test)); assertThrows(TransferStatusCanceledException.class, out::getStatus); - new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DeepboxDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSAttributesFinderFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSAttributesFinderFeatureTest.java index 873fc2db9d..e8142977c8 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSAttributesFinderFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSAttributesFinderFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -55,7 +55,7 @@ public class SDSAttributesFinderFeatureTest extends AbstractSDSTest { f.find(test); } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -92,7 +92,7 @@ public class SDSAttributesFinderFeatureTest extends AbstractSDSTest { catch(NotfoundException e) { // Expected } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -117,7 +117,7 @@ public class SDSAttributesFinderFeatureTest extends AbstractSDSTest { catch(NotfoundException e) { // Expected } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -133,7 +133,7 @@ public class SDSAttributesFinderFeatureTest extends AbstractSDSTest { assertTrue(attributes.getPermission().isReadable()); assertTrue(attributes.getPermission().isWritable()); assertTrue(attributes.getPermission().isExecutable()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -166,7 +166,7 @@ public class SDSAttributesFinderFeatureTest extends AbstractSDSTest { assertEquals(previous.getModificationDate(), new SDSAttributesFinderFeature(session, nodeid).find(folder, new DisabledListProgressListener()).getModificationDate()); // Branch version is changing with background task only // assertNotEquals(previous.getRevision(), new SDSAttributesFinderFeature(session, nodeid).find(folder, new DisabledListProgressListener()).getRevision()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -184,6 +184,6 @@ public class SDSAttributesFinderFeatureTest extends AbstractSDSTest { final SDSAttributesFinderFeature f = new SDSAttributesFinderFeature(session, nodeid); assertEquals(latestnodeid, f.find(test).getVersionId()); assertEquals(latestnodeid, test.attributes().getVersionId()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSBatchDeleteFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSBatchDeleteFeatureTest.java index edc994bc08..88392548c0 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSBatchDeleteFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSBatchDeleteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -46,10 +46,10 @@ public class SDSBatchDeleteFeatureTest extends AbstractSDSTest { final Path file2 = new Path(room, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new SDSTouchFeature(session, nodeid).touch(new SDSDirectS3MultipartWriteFeature(session, nodeid), file1, new TransferStatus()); new SDSTouchFeature(session, nodeid).touch(new SDSDirectS3MultipartWriteFeature(session, nodeid), file2, new TransferStatus()); - new SDSBatchDeleteFeature(session, nodeid).delete(Arrays.asList(file1, file2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSBatchDeleteFeature(session, nodeid).delete(Arrays.asList(file1, file2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SDSFindFeature(session, nodeid).find(file1)); assertFalse(new SDSFindFeature(session, nodeid).find(file2)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -63,7 +63,7 @@ public class SDSBatchDeleteFeatureTest extends AbstractSDSTest { new SDSDirectS3MultipartWriteFeature(session, nodeid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new SDSFindFeature(session, nodeid).find(file)); assertNotNull(nodeid.getVersionId(file)); - new SDSBatchDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSBatchDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); file.attributes().setVersionId(null); folder.attributes().setVersionId(null); try { @@ -93,9 +93,9 @@ public class SDSBatchDeleteFeatureTest extends AbstractSDSTest { final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new SDSTouchFeature(session, nodeid).touch(new SDSDirectS3MultipartWriteFeature(session, nodeid), file, new TransferStatus()); assertTrue(new SDSFindFeature(session, nodeid).find(file)); - new SDSBatchDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSBatchDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SDSFindFeature(session, nodeid).find(folder)); - new SDSBatchDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSBatchDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SDSFindFeature(session, nodeid).find(room)); } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDelegatingCopyFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDelegatingCopyFeatureTest.java index 13c95d33d4..85c692dcee 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDelegatingCopyFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDelegatingCopyFeatureTest.java @@ -22,8 +22,8 @@ import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.UnsupportedException; @@ -86,7 +86,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { assertEquals(target.attributes().getVersionId(), new SDSAttributesFinderFeature(session, nodeid).find(target).getVersionId()); assertTrue(new SDSFindFeature(session, nodeid).find(test)); assertTrue(new SDSFindFeature(session, nodeid).find(copy)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -105,7 +105,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { assertEquals(target.attributes().getVersionId(), new SDSAttributesFinderFeature(session, nodeid).find(target).getVersionId()); assertTrue(new SDSFindFeature(session, nodeid).find(test)); assertTrue(new SDSFindFeature(session, nodeid).find(copy)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -129,7 +129,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { final Find find = new DefaultFindFeature(session); final AttributedList files = new SDSListService(session, nodeid).list(targetFolder, new DisabledListProgressListener()); assertTrue(find.find(copy)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -148,7 +148,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { assertNotNull(feature.copy(test, copy, new TransferStatus().setExists(true), ConnectionCallback.noop, StreamListener.noop).attributes().getVersionId()); final Find find = new DefaultFindFeature(session); assertTrue(find.find(copy)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -168,7 +168,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { assertTrue(new SDSFindFeature(session, nodeid).find(file)); assertTrue(new SDSFindFeature(session, nodeid).find(target)); assertTrue(new SDSFindFeature(session, nodeid).find(copy)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -185,7 +185,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { assertNotNull(feature.copy(source, target, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop).attributes().getVersionId()); assertTrue(new SDSFindFeature(session, nodeid).find(source)); assertTrue(new SDSFindFeature(session, nodeid).find(target)); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -240,7 +240,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -281,7 +281,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -338,7 +338,7 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -395,6 +395,6 @@ public class SDSDelegatingCopyFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDelegatingMoveFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDelegatingMoveFeatureTest.java index d8ae99599e..13147cd065 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDelegatingMoveFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDelegatingMoveFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; @@ -77,7 +77,7 @@ public class SDSDelegatingMoveFeatureTest extends AbstractSDSTest { assertTrue(new SDSFindFeature(session, nodeid).find(target)); assertEquals(0, session.getMetrics().get(Copy.class)); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, target.attributes(), new SDSAttributesFinderFeature(session, nodeid).find(target))); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -92,7 +92,7 @@ public class SDSDelegatingMoveFeatureTest extends AbstractSDSTest { new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertEquals(versionId, result.attributes().getVersionId()); assertEquals(0, session.getMetrics().get(Copy.class)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -110,7 +110,7 @@ public class SDSDelegatingMoveFeatureTest extends AbstractSDSTest { assertFalse(new SDSFindFeature(session, nodeid).find(test)); assertTrue(new SDSFindFeature(session, nodeid).find(target)); assertEquals(0, session.getMetrics().get(Copy.class)); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -131,7 +131,7 @@ public class SDSDelegatingMoveFeatureTest extends AbstractSDSTest { assertTrue(new SDSFindFeature(session, nodeid).find(test2)); assertTrue(new SDSFindFeature(session, nodeid).find(target)); assertEquals(0, session.getMetrics().get(Copy.class)); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -182,7 +182,7 @@ public class SDSDelegatingMoveFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -220,7 +220,7 @@ public class SDSDelegatingMoveFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -273,7 +273,7 @@ public class SDSDelegatingMoveFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(room1, room2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -294,6 +294,6 @@ public class SDSDelegatingMoveFeatureTest extends AbstractSDSTest { assertFalse(new SDSFindFeature(session, nodeid).find(new Path(roomName, EnumSet.of(Path.Type.directory, Path.Type.volume)))); assertTrue(new SDSFindFeature(session, nodeid).find(renamed)); assertTrue(new SDSFindFeature(session, nodeid).find(new Path(renamed, folder.getName(), EnumSet.of(Path.Type.directory)))); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDeleteFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDeleteFeatureTest.java index 59da44ec87..33bf6b0fe9 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDeleteFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDeleteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -59,15 +59,15 @@ public class SDSDeleteFeatureTest extends AbstractSDSTest { final Path file = new SDSTouchFeature(session, nodeid).touch(new SDSDirectS3MultipartWriteFeature(session, nodeid), new Path(room, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final String versionId = file.attributes().getVersionId(); assertNotNull(versionId); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); try { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(file.withAttributes(new DefaultPathAttributes().setVersionId(versionId))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(file.withAttributes(new DefaultPathAttributes().setVersionId(versionId))), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } catch(NotfoundException e) { // Expected } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -78,9 +78,9 @@ public class SDSDeleteFeatureTest extends AbstractSDSTest { final Path fileInRoom = new Path(room, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new SDSTouchFeature(session, nodeid).touch(new SDSDirectS3MultipartWriteFeature(session, nodeid), fileInRoom, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(fileInRoom)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInRoom), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInRoom), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(fileInRoom)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -94,7 +94,7 @@ public class SDSDeleteFeatureTest extends AbstractSDSTest { new SDSDirectS3MultipartWriteFeature(session, nodeid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new SDSFindFeature(session, nodeid).find(file)); assertNotNull(nodeid.getVersionId(file)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); file.attributes().setVersionId(null); folder.attributes().setVersionId(null); try { @@ -124,9 +124,9 @@ public class SDSDeleteFeatureTest extends AbstractSDSTest { final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new SDSTouchFeature(session, nodeid).touch(new SDSDirectS3MultipartWriteFeature(session, nodeid), file, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(file)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(folder)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(room)); } @@ -154,7 +154,7 @@ public class SDSDeleteFeatureTest extends AbstractSDSTest { status.setLength(eicar.length); final SDSDirectS3UploadFeature feature = new SDSDirectS3UploadFeature(session, nodeid); final Node node = feature.upload(new SDSDelegatingWriteFeature(session, nodeid, new SDSDirectS3WriteFeature(session, nodeid)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new SDSFindFeature(session, nodeid).find(test)); final PathAttributes attributes = new SDSAttributesFinderFeature(session, nodeid).find(test); assertEquals(eicar.length, attributes.getSize()); @@ -162,15 +162,15 @@ public class SDSDeleteFeatureTest extends AbstractSDSTest { // Wait for verdict } try { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } catch(AntiVirusAccessDeniedException e) { // Expected } new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test.withAttributes(new SDSAttributesFinderFeature(session, nodeid).find(test))), - new DisabledLoginCallback(), new Delete.DisabledCallback()); + LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(test)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectS3MultipartWriteFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectS3MultipartWriteFeatureTest.java index c5bb9cfd06..3e82caf0d5 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectS3MultipartWriteFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectS3MultipartWriteFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; @@ -70,7 +70,7 @@ public class SDSDirectS3MultipartWriteFeatureTest extends AbstractSDSTest { assertEquals(0L, out.getStatus().getSize(), 0L); assertNotNull(test.attributes().getVersionId()); assertTrue(new DefaultFindFeature(session).find(test)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -126,7 +126,7 @@ public class SDSDirectS3MultipartWriteFeatureTest extends AbstractSDSTest { catch(NotfoundException e) { // Expected } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -190,7 +190,7 @@ public class SDSDirectS3MultipartWriteFeatureTest extends AbstractSDSTest { catch(NotfoundException e) { // Expected } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectS3UploadFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectS3UploadFeatureTest.java index 7e3a606afa..5ac3d0e7dc 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectS3UploadFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectS3UploadFeatureTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; @@ -84,7 +84,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { return super.write(file, status, callback); } }, test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); fail(); } catch(ConnectionCanceledException e) { @@ -93,7 +93,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { assertEquals(PathAttributes.EMPTY, status.getResponse()); } assertFalse(new SDSFindFeature(session, nodeid).find(test)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -112,11 +112,11 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { final TransferStatus status = new TransferStatus(); status.setLength(random.length); feature.upload(new SDSDirectS3WriteFeature(session, nodeid), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new SDSFindFeature(session, nodeid).find(test)); final PathAttributes attributes = new SDSAttributesFinderFeature(session, nodeid).find(test); assertEquals(random.length, attributes.getSize()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -132,7 +132,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { new DefaultLocalTouchFeature().touch(local); final TransferStatus status = new TransferStatus(); assertThrows(NotfoundException.class, () -> feature.upload(new SDSDirectS3WriteFeature(session, nodeid), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback())); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop)); local.delete(); } @@ -151,12 +151,12 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { final TransferStatus status = new TransferStatus(); status.setLength(random.length); final Node node = feature.upload(new SDSDirectS3WriteFeature(session, nodeid), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new SDSFindFeature(session, nodeid).find(test)); final PathAttributes attributes = new SDSAttributesFinderFeature(session, nodeid).find(test); assertEquals(random.length, attributes.getSize()); assertEquals(new SDSAttributesAdapter(session).toAttributes(node), attributes); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -175,14 +175,14 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { final TransferStatus status = new TransferStatus(); status.setLength(random.length); final Node node = feature.upload(new SDSDirectS3WriteFeature(session, nodeid), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(status.isComplete()); assertNotSame(PathAttributes.EMPTY, status.getResponse()); assertTrue(new SDSFindFeature(session, nodeid).find(test)); final PathAttributes attributes = new SDSAttributesFinderFeature(session, nodeid).find(test); assertEquals(random.length, attributes.getSize()); assertEquals(new SDSAttributesAdapter(session).toAttributes(node), attributes); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -201,14 +201,14 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { final TransferStatus status = new TransferStatus(); status.setLength(random.length); final Node node = feature.upload(new SDSDirectS3WriteFeature(session, nodeid), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(status.isComplete()); assertNotSame(PathAttributes.EMPTY, status.getResponse()); assertTrue(new SDSFindFeature(session, nodeid).find(test)); final PathAttributes attributes = new SDSAttributesFinderFeature(session, nodeid).find(test); assertEquals(random.length, attributes.getSize()); assertEquals(new SDSAttributesAdapter(session).toAttributes(node), attributes); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -230,7 +230,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { final SDSEncryptionBulkFeature bulk = new SDSEncryptionBulkFeature(session, nodeid); bulk.pre(Transfer.Type.upload, Collections.singletonMap(new TransferItem(test, local), status), ConnectionCallback.noop); final Node node = feature.upload(new TripleCryptWriteFeature(session, nodeid, new SDSDirectS3WriteFeature(session, nodeid)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(status.isComplete()); assertNotSame(PathAttributes.EMPTY, status.getResponse()); assertTrue(new SDSFindFeature(session, nodeid).find(test)); @@ -247,7 +247,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(random, compare); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -269,7 +269,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { final SDSEncryptionBulkFeature bulk = new SDSEncryptionBulkFeature(session, nodeid); bulk.pre(Transfer.Type.upload, Collections.singletonMap(new TransferItem(test, local), status), ConnectionCallback.noop); final Node node = feature.upload(new TripleCryptWriteFeature(session, nodeid, new SDSDirectS3WriteFeature(session, nodeid)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(status.isComplete()); assertNotSame(PathAttributes.EMPTY, status.getResponse()); assertTrue(new SDSFindFeature(session, nodeid).find(test)); @@ -286,7 +286,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(random, compare); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -308,7 +308,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { final SDSEncryptionBulkFeature bulk = new SDSEncryptionBulkFeature(session, nodeid); bulk.pre(Transfer.Type.upload, Collections.singletonMap(new TransferItem(test, local), status), ConnectionCallback.noop); final Node node = feature.upload(new TripleCryptWriteFeature(session, nodeid, new SDSDirectS3WriteFeature(session, nodeid)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(status.isComplete()); assertNotSame(PathAttributes.EMPTY, status.getResponse()); assertTrue(new SDSFindFeature(session, nodeid).find(test)); @@ -325,7 +325,7 @@ public class SDSDirectS3UploadFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(random, compare); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectoryFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectoryFeatureTest.java index c17736eed7..8abd0a6998 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectoryFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSDirectoryFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.sds; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -27,7 +27,6 @@ import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.test.IntegrationTest; -import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -63,7 +62,7 @@ public class SDSDirectoryFeatureTest extends AbstractSDSTest { new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertEquals(node.getId().toString(), nodeid.getVersionId(test)); assertEquals(test.attributes().getVersionId(), node.getId().toString()); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(subdir, test, room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(subdir, test, room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -73,7 +72,7 @@ public class SDSDirectoryFeatureTest extends AbstractSDSTest { new SDSDirectS3MultipartWriteFeature(session, nodeid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); assertNotNull(room.attributes().getVersionId()); assertTrue(new DefaultFindFeature(session).find(room)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(room)); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSFindFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSFindFeatureTest.java index 7241e24149..a2a16ed8d7 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSFindFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.sds; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; @@ -43,7 +43,7 @@ public class SDSFindFeatureTest extends AbstractSDSTest { new SDSDirectS3MultipartWriteFeature(session, nodeid), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new SDSFindFeature(session, nodeid).find(folder)); assertFalse(new SDSFindFeature(session, nodeid).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -55,7 +55,7 @@ public class SDSFindFeatureTest extends AbstractSDSTest { new SDSTouchFeature(session, nodeid).touch(new SDSDirectS3MultipartWriteFeature(session, nodeid), file, new TransferStatus()); assertTrue(new SDSFindFeature(session, nodeid).find(file)); assertFalse(new SDSFindFeature(session, nodeid).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSListServiceTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSListServiceTest.java index e63cee46b8..05239d91b2 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSListServiceTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSListServiceTest.java @@ -20,7 +20,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -80,7 +80,7 @@ public class SDSListServiceTest extends AbstractSDSTest { new SDSTouchFeature(session, nodeid).touch(new SDSDirectS3MultipartWriteFeature(session, nodeid), new Path(room, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertEquals(3, (new SDSListService(session, nodeid).list(room, new DisabledListProgressListener(), 1).size())); assertEquals(3, (new SDSListService(session, nodeid).list(room, new DisabledListProgressListener()).size())); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -97,6 +97,6 @@ public class SDSListServiceTest extends AbstractSDSTest { assertEquals("0a", list.get(0).getName()); assertEquals("a", list.get(1).getName()); assertEquals("aa", list.get(2).getName()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMissingFileKeysSchedulerFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMissingFileKeysSchedulerFeatureTest.java index 4df5b909a5..c73c901dfc 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMissingFileKeysSchedulerFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMissingFileKeysSchedulerFeatureTest.java @@ -21,6 +21,7 @@ import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.LoginCanceledException; @@ -100,7 +101,7 @@ public class SDSMissingFileKeysSchedulerFeatureTest extends AbstractSDSTest { } }); assertTrue(processed.stream().filter(userFileKeySetRequest -> userFileKeySetRequest.getFileId().equals(Long.parseLong(test.attributes().getVersionId()))).findAny().isPresent()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } private void removeKeyPairs(UserApi userApi) throws ApiException { @@ -184,6 +185,6 @@ public class SDSMissingFileKeysSchedulerFeatureTest extends AbstractSDSTest { }); assertTrue(empty.isEmpty()); assertEquals(2, userApi.requestUserKeyPairs(null).size()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMoveFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMoveFeatureTest.java index 69af262892..d2209e9e6a 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMoveFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMoveFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.InteroperabilityException; import ch.cyberduck.core.exception.NotfoundException; @@ -51,7 +51,7 @@ public class SDSMoveFeatureTest extends AbstractSDSTest { assertEquals(0, session.getMetrics().get(Copy.class)); assertFalse(new SDSFindFeature(session, nodeid).find(new Path(room, foldername, EnumSet.of(Path.Type.directory)))); assertTrue(new SDSFindFeature(session, nodeid).find(target)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) @@ -67,7 +67,7 @@ public class SDSMoveFeatureTest extends AbstractSDSTest { assertEquals(0, session.getMetrics().get(Copy.class)); assertFalse(new SDSFindFeature(session, nodeid).find(test)); assertTrue(new SDSFindFeature(session, nodeid).find(target)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -97,7 +97,7 @@ public class SDSMoveFeatureTest extends AbstractSDSTest { subroom.attributes().setVersionId(null); assertFalse(new SDSFindFeature(session, nodeid).find(subroom)); assertTrue(new SDSFindFeature(session, nodeid).find(target)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -110,7 +110,7 @@ public class SDSMoveFeatureTest extends AbstractSDSTest { assertEquals(0, session.getMetrics().get(Copy.class)); assertFalse(new SDSFindFeature(session, nodeid).find(new Path(directoryname, EnumSet.of(Path.Type.directory, Path.Type.volume)))); assertTrue(new SDSFindFeature(session, nodeid).find(target)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @@ -125,7 +125,7 @@ public class SDSMoveFeatureTest extends AbstractSDSTest { new SDSMoveFeature(session, nodeid).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new SDSFindFeature(session, nodeid).find(new Path(room, filename, EnumSet.of(Path.Type.file)))); assertTrue(new SDSFindFeature(session, nodeid).find(target)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -139,7 +139,7 @@ public class SDSMoveFeatureTest extends AbstractSDSTest { new SDSMoveFeature(session, nodeid).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new SDSFindFeature(session, nodeid).find(new Path(room, filename, EnumSet.of(Path.Type.file)))); assertTrue(new SDSFindFeature(session, nodeid).find(target)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMultipartWriteFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMultipartWriteFeatureTest.java index d833d1dbd0..25d350b1d4 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMultipartWriteFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSMultipartWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.ConnectionCanceledException; @@ -77,7 +77,7 @@ public class SDSMultipartWriteFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -144,7 +144,7 @@ public class SDSMultipartWriteFeatureTest extends AbstractSDSTest { catch(NotfoundException e) { // Expected } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = TransferStatusCanceledException.class) @@ -182,7 +182,7 @@ public class SDSMultipartWriteFeatureTest extends AbstractSDSTest { final String fileid = nodeid.getNodeId(room, 1); assertEquals(fileid, room.attributes().getVersionId()); final Path test = new Path(room, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); final Path roomNew = new SDSDirectoryFeature(session, nodeid).mkdir( new SDSDirectS3MultipartWriteFeature(session, nodeid), new Path(rommname, EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); assertNotEquals(fileid, roomNew.attributes().getVersionId()); @@ -192,7 +192,7 @@ public class SDSMultipartWriteFeatureTest extends AbstractSDSTest { final HttpResponseOutputStream out = writer.write(test, status, ConnectionCallback.noop); assertNotNull(out); out.close(); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(roomNew), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(roomNew), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) @@ -218,7 +218,7 @@ public class SDSMultipartWriteFeatureTest extends AbstractSDSTest { new StreamCopier(status, status).transfer(new ByteArrayInputStream(content), out); assertNotNull(test.attributes().getVersionId()); assertTrue(new DefaultFindFeature(session).find(test)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -234,6 +234,6 @@ public class SDSMultipartWriteFeatureTest extends AbstractSDSTest { new StreamCopier(status, status).transfer(new NullInputStream(0L), out); assertNotNull(test.attributes().getVersionId()); assertTrue(new DefaultFindFeature(session).find(test)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSNodeIdProviderTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSNodeIdProviderTest.java index ed24cc4b3e..89ec12a836 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSNodeIdProviderTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSNodeIdProviderTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -69,7 +69,7 @@ public class SDSNodeIdProviderTest extends AbstractSDSTest { catch(NotfoundException e) { // Expected } - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(file, room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(file, room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -93,7 +93,7 @@ public class SDSNodeIdProviderTest extends AbstractSDSTest { assertNotEquals(versionIdTouch, file.attributes().getVersionId()); nodeid.clear(); assertEquals(file.attributes().getVersionId(), nodeid.getNodeId(new Path(room, name, EnumSet.of(Path.Type.file)), 1)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,7 +115,7 @@ public class SDSNodeIdProviderTest extends AbstractSDSTest { // } assertEquals(file.attributes().getVersionId(), nodeid.getNodeId(new Path(folder, file.getName(), EnumSet.of(Path.Type.file)), 1)); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -137,6 +137,6 @@ public class SDSNodeIdProviderTest extends AbstractSDSTest { catch(NotfoundException e) { // } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSQuotaFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSQuotaFeatureTest.java index 826270b47c..956613e66f 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSQuotaFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSQuotaFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.sds; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Quota; @@ -50,6 +50,6 @@ public class SDSQuotaFeatureTest extends AbstractSDSTest { final Quota.Space quota = new SDSQuotaFeature(session, nodeid).get(); assertNotNull(quota.available); assertNotNull(quota.used); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSReadFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSReadFeatureTest.java index b0ddc4f3e2..7e1344b0ba 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSReadFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSReadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.exception.NotfoundException; @@ -61,7 +61,7 @@ public class SDSReadFeatureTest extends AbstractSDSTest { new SDSReadFeature(session, nodeid).read(new Path(room, "nosuchname", EnumSet.of(Path.Type.file)), status, ConnectionCallback.noop); } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -91,7 +91,7 @@ public class SDSReadFeatureTest extends AbstractSDSTest { assertNotNull(in); in.close(); } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -124,7 +124,7 @@ public class SDSReadFeatureTest extends AbstractSDSTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -157,7 +157,7 @@ public class SDSReadFeatureTest extends AbstractSDSTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -177,7 +177,7 @@ public class SDSReadFeatureTest extends AbstractSDSTest { final CountingInputStream in = new CountingInputStream(new SDSReadFeature(session, nodeid).read(test, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -193,13 +193,13 @@ public class SDSReadFeatureTest extends AbstractSDSTest { test.attributes().setVersionId(invalidId); nodeid.cache(test, invalidId); try { - final InputStream in = new SDSReadFeature(session, nodeid).read(test, new TransferStatus().setRemote(test.attributes()), new DisabledLoginCallback()); + final InputStream in = new SDSReadFeature(session, nodeid).read(test, new TransferStatus().setRemote(test.attributes()), LoginCallback.noop); fail(); } catch(NotfoundException e) { // } assertNull(test.attributes().getVersionId()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSearchFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSearchFeatureTest.java index e67eb01928..5f97e15aed 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSearchFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSearchFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.exception.NotfoundException; @@ -68,6 +68,6 @@ public class SDSSearchFeatureTest extends AbstractSDSTest { assertNotNull(result.find(new SimplePathPredicate(filesubdir))); assertEquals(subdir, result.find(new SimplePathPredicate(filesubdir)).getParent()); } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSessionTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSessionTest.java index aeb168e08a..8749f0170b 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSessionTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSSessionTest.java @@ -15,20 +15,7 @@ package ch.cyberduck.core.sds; * GNU General Public License for more details. */ -import ch.cyberduck.core.Credentials; -import ch.cyberduck.core.DisabledCertificateIdentityCallback; -import ch.cyberduck.core.DisabledCertificateStore; -import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; -import ch.cyberduck.core.DisabledPasswordStore; -import ch.cyberduck.core.Host; -import ch.cyberduck.core.LoginConnectionService; -import ch.cyberduck.core.LoginOptions; -import ch.cyberduck.core.Path; -import ch.cyberduck.core.Profile; -import ch.cyberduck.core.ProgressListener; -import ch.cyberduck.core.ProtocolFactory; +import ch.cyberduck.core.*; import ch.cyberduck.core.exception.ConnectionRefusedException; import ch.cyberduck.core.exception.LoginCanceledException; import ch.cyberduck.core.exception.ProxyLoginFailureException; @@ -86,10 +73,10 @@ public class SDSSessionTest extends AbstractSDSTest { System.getProperties().getProperty("dracoon.user"), System.getProperties().getProperty("dracoon.key") )); final SDSSession session = new SDSSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); assertFalse(new SDSListService(session, new SDSNodeIdProvider(session)).list(new Path("/", EnumSet.of(Path.Type.directory)), new DisabledListProgressListener()).isEmpty()); } @@ -103,7 +90,7 @@ public class SDSSessionTest extends AbstractSDSTest { )); final SDSSession session = new SDSSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); final LoginConnectionService c = new LoginConnectionService( - new DisabledLoginCallback(), + LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop, diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSShareFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSShareFeatureTest.java index cd18c27994..810fc48de9 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSShareFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSShareFeatureTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DescriptiveUrl; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.InteroperabilityException; @@ -66,7 +66,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/download-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -87,7 +87,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/download-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -109,7 +109,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/download-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) @@ -131,7 +131,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { .maxDownloads(null), new DisabledPasswordCallback()); } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -155,7 +155,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { .maxDownloads(null), new DisabledPasswordCallback()); } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -178,7 +178,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { .maxDownloads(null), new DisabledPasswordCallback()); } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -200,7 +200,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { .maxDownloads(null), new DisabledPasswordCallback()); } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -223,7 +223,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/download-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) @@ -245,7 +245,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/download-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -274,7 +274,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/download-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = LoginCanceledException.class) @@ -298,7 +298,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { .maxDownloads(null), new DisabledPasswordCallback()); } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -324,7 +324,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/upload-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -351,7 +351,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/upload-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -377,7 +377,7 @@ public class SDSShareFeatureTest extends AbstractSDSTest { assertNotEquals(DescriptiveUrl.EMPTY, url); assertEquals(DescriptiveUrl.Type.signed, url.getType()); assertTrue(url.getUrl().startsWith("https://duck.dracoon.com/public/upload-shares/")); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSTimestampFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSTimestampFeatureTest.java index c7cb7c8c77..09ef780d92 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSTimestampFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSTimestampFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.sds; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -49,7 +49,7 @@ public class SDSTimestampFeatureTest extends AbstractSDSTest { assertEquals(1599047952805L, attributes.getModificationDate()); assertEquals(status.getResponse(), attributes); assertNotEquals(revision, attributes.getRevision()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -62,7 +62,7 @@ public class SDSTimestampFeatureTest extends AbstractSDSTest { final SDSAttributesFinderFeature f = new SDSAttributesFinderFeature(session, nodeid); final PathAttributes attributes = f.find(test); assertEquals(1599047952805L, attributes.getModificationDate()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -74,6 +74,6 @@ public class SDSTimestampFeatureTest extends AbstractSDSTest { final SDSAttributesFinderFeature f = new SDSAttributesFinderFeature(session, nodeid); final PathAttributes attributes = f.find(room); assertEquals(1599047952805L, attributes.getModificationDate()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSTouchFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSTouchFeatureTest.java index 5909571249..6ab91ae30a 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSTouchFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSTouchFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.sds; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.BackgroundException; @@ -86,7 +86,7 @@ public class SDSTouchFeatureTest extends AbstractSDSTest { throw e; } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -106,7 +106,7 @@ public class SDSTouchFeatureTest extends AbstractSDSTest { throw e; } finally { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -120,7 +120,7 @@ public class SDSTouchFeatureTest extends AbstractSDSTest { assertNotNull(test.attributes().getVersionId()); assertTrue(new SDSFindFeature(session, nodeid).find(test)); assertEquals(test.attributes().getVersionId(), new SDSAttributesFinderFeature(session, nodeid).find(test).getVersionId()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -153,6 +153,6 @@ public class SDSTouchFeatureTest extends AbstractSDSTest { assertFalse(new SDSTouchFeature(session, nodeid).isSupported(room.withAttributes(attr), StringUtils.EMPTY)); assertEquals(quota, attr.getQuota().available, 0L); assertEquals(2L, attr.getSize()); - new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(test, room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Arrays.asList(test, room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSVersioningFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSVersioningFeatureTest.java index 527b4d4f44..12529c2319 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/SDSVersioningFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/SDSVersioningFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.InteroperabilityException; @@ -105,7 +105,7 @@ public class SDSVersioningFeatureTest extends AbstractSDSTest { // Ignore JSON parsing error } try { - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } catch(InteroperabilityException e) { // Ignore JSON parsing error diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptReadFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptReadFeatureTest.java index 722a4c9283..e225478b7c 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptReadFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptReadFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; @@ -103,6 +103,6 @@ public class TripleCryptReadFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(Arrays.copyOfRange(content, 1000, content.length), compare); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptWriteFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptWriteFeatureTest.java index 2fe7ed0762..9a142caed9 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptWriteFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/sds/triplecrypt/TripleCryptWriteFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; @@ -99,7 +99,7 @@ public class TripleCryptWriteFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @@ -139,6 +139,6 @@ public class TripleCryptWriteFeatureTest extends AbstractSDSTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java index b2edb92283..34ddf467a5 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Attributes; import ch.cyberduck.core.CachingAttributesFinderFeature; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.exception.NotfoundException; @@ -71,6 +71,6 @@ public class DefaultAttributesFinderFeatureTest extends AbstractSDSTest { catch(NotfoundException e) { // Expected } - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultCopyFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultCopyFeatureTest.java index cdf69ce06b..494bd06033 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultCopyFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultCopyFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.StatusOutputStream; @@ -74,6 +74,6 @@ public class DefaultCopyFeatureTest extends AbstractSDSTest { assertTrue(new DefaultFindFeature(session).find(source)); assertTrue(new DefaultFindFeature(session).find(target)); assertEquals(content.length, new DefaultAttributesFinderFeature(session).find(target).getSize()); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java b/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java index deae7f2379..644b60d6c4 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.BandwidthThrottle; @@ -88,7 +88,7 @@ public class DefaultDownloadFeatureTest extends AbstractSDSTest { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -121,6 +121,6 @@ public class DefaultDownloadFeatureTest extends AbstractSDSTest { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java b/dracoon/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java index e06fd1b209..5e1ca6560a 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -55,7 +55,7 @@ public class CopyWorkerTest extends AbstractSDSTest { worker.run(session); assertTrue(new SDSFindFeature(session, nodeid).find(source)); assertTrue(new SDSFindFeature(session, nodeid).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(room), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(room), ProgressListener.noop).run(session); } @Test @@ -75,7 +75,7 @@ public class CopyWorkerTest extends AbstractSDSTest { worker.run(session); assertTrue(new SDSFindFeature(session, nodeid).find(sourceFile)); assertTrue(new SDSFindFeature(session, nodeid).find(targetFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(room), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(room), ProgressListener.noop).run(session); } @Test @@ -95,6 +95,6 @@ public class CopyWorkerTest extends AbstractSDSTest { assertTrue(new SDSFindFeature(session, nodeid).find(targetFile)); assertTrue(new SDSFindFeature(session, nodeid).find(folder)); assertTrue(new SDSFindFeature(session, nodeid).find(sourceFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(room), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(room), ProgressListener.noop).run(session); } } diff --git a/dracoon/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java b/dracoon/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java index 8a73bb5aca..d053362dbc 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.worker; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -56,7 +56,7 @@ public class DeleteWorkerTest extends AbstractSDSTest { final Path file = new SDSTouchFeature(session, nodeid).touch( new SDSDirectS3MultipartWriteFeature(session, nodeid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new SDSFindFeature(session, nodeid).find(file)); - final DeleteWorker worker = new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(folder), ProgressListener.noop); + final DeleteWorker worker = new DeleteWorker(LoginCallback.noop, Collections.singletonList(folder), ProgressListener.noop); int hashCode = worker.hashCode(); worker.run(session); assertEquals(hashCode, worker.hashCode()); diff --git a/dracoon/src/test/java/ch/cyberduck/core/worker/SDSSingleTransferWorkerTest.java b/dracoon/src/test/java/ch/cyberduck/core/worker/SDSSingleTransferWorkerTest.java index b1c69ca7d9..ffff193e38 100644 --- a/dracoon/src/test/java/ch/cyberduck/core/worker/SDSSingleTransferWorkerTest.java +++ b/dracoon/src/test/java/ch/cyberduck/core/worker/SDSSingleTransferWorkerTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -102,14 +102,14 @@ public class SDSSingleTransferWorkerTest extends AbstractSDSTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); byte[] compare = new byte[content.length]; assertArrayEquals(content, IOUtils.toByteArray(localFile.getInputStream())); test.attributes().setVersionId(versionId); assertEquals(versionId, new DefaultAttributesFinderFeature(session).find(test).getVersionId()); - new SDSDeleteFeature(session, fileid).delete(Arrays.asList(test, room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, fileid).delete(Arrays.asList(test, room), LoginCallback.noop, new Delete.DisabledCallback()); localFile.delete(); } @@ -128,11 +128,11 @@ public class SDSSingleTransferWorkerTest extends AbstractSDSTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertTrue(t.isComplete()); assertTrue(new SDSFindFeature(session, fileid).find(room)); - new SDSDeleteFeature(session, fileid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SDSDeleteFeature(session, fileid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 42b5b6622e..c3370ee671 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -94,7 +94,7 @@ public class CopyWorkerTest extends AbstractDropboxTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new DropboxReadFeature(session), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -118,7 +118,7 @@ public class CopyWorkerTest extends AbstractDropboxTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -143,7 +143,7 @@ public class CopyWorkerTest extends AbstractDropboxTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -174,7 +174,7 @@ public class CopyWorkerTest extends AbstractDropboxTest { assertTrue(cryptomator.getFeature(session, Find.class, new DropboxFindFeature(session)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -199,7 +199,7 @@ public class CopyWorkerTest extends AbstractDropboxTest { worker.run(session); assertTrue(new DropboxFindFeature(session).find(cleartextFile)); assertTrue(cryptomator.getFeature(session, Find.class, new DropboxFindFeature(session)).find(encryptedFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -226,7 +226,7 @@ public class CopyWorkerTest extends AbstractDropboxTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DropboxFindFeature(session).find(cleartextFolder)); assertTrue(new DropboxFindFeature(session).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -254,7 +254,7 @@ public class CopyWorkerTest extends AbstractDropboxTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DropboxFindFeature(session)).find(encryptedFile)); assertTrue(new DropboxFindFeature(session).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); registry.clear(); } @@ -283,7 +283,7 @@ public class CopyWorkerTest extends AbstractDropboxTest { assertTrue(new DropboxFindFeature(session).find(cleartextFolder)); final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new DropboxFindFeature(session).find(fileRenamed)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); registry.clear(); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CryptoDropboxSingleTransferWorkerTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CryptoDropboxSingleTransferWorkerTest.java index a8db368b9e..f8ed58eaea 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CryptoDropboxSingleTransferWorkerTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CryptoDropboxSingleTransferWorkerTest.java @@ -18,10 +18,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -101,7 +101,7 @@ public class CryptoDropboxSingleTransferWorkerTest extends AbstractDropboxTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertTrue(cryptomator.getFeature(session, Find.class, new DropboxFindFeature(session)).find(dir1)); @@ -119,7 +119,7 @@ public class CryptoDropboxSingleTransferWorkerTest extends AbstractDropboxTest { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxDirectoryFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxDirectoryFeatureTest.java index 3b6fa9869f..41add3b8ef 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxDirectoryFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxDirectoryFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.dropbox.DropboxAttributesFinderFeature; @@ -65,7 +65,7 @@ public class DropboxDirectoryFeatureTest extends AbstractDropboxTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DropboxAttributesFinderFeature(session)).find(test); assertEquals(test.attributes().getSize(), attributes.getSize()); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -80,6 +80,6 @@ public class DropboxDirectoryFeatureTest extends AbstractDropboxTest { cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DropboxWriteFeature(session)), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxListServiceTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxListServiceTest.java index ef2ce97f56..0249748dfd 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxListServiceTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxListServiceTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; @@ -64,6 +64,6 @@ public class DropboxListServiceTest extends AbstractDropboxTest { session), cryptomator).touch( new CryptoWriteFeature<>(session, new DropboxWriteFeature(session), cryptomator), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertEquals(test, new CryptoListService(session, new DropboxListService(session), cryptomator).list(vault, new DisabledListProgressListener()).get(0)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxMoveFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxMoveFeatureTest.java index f5858dda58..355e81e62f 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxMoveFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxMoveFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -86,6 +86,6 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DropboxFindFeature(session)).find(fileRenamedInRenamedFolder)); cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList( - fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxTouchFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxTouchFeatureTest.java index 1c7bfd7cc3..bb16d86f16 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxTouchFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxTouchFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -70,7 +70,7 @@ public class DropboxTouchFeatureTest extends AbstractDropboxTest { assertEquals(0L, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DropboxFindFeature(session)).find(test)); assertEquals(test.attributes(), cryptomator.getFeature(session, AttributesFinder.class, new DropboxAttributesFinderFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -88,6 +88,6 @@ public class DropboxTouchFeatureTest extends AbstractDropboxTest { assertEquals(0L, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); assertEquals(test.attributes(), cryptomator.getFeature(session, AttributesFinder.class, new DropboxAttributesFinderFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxWriteFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxWriteFeatureTest.java index 12e8bc9c6e..1aa7c25cd3 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxWriteFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxWriteFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -92,6 +92,6 @@ public class DropboxWriteFeatureTest extends AbstractDropboxTest { final InputStream in = new CryptoReadFeature(session, new DropboxReadFeature(session), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index b07794c916..3ba9493ab6 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -73,11 +73,11 @@ public class MoveWorkerTest extends AbstractDropboxTest { new CryptoTouchFeature<>(session, new DropboxTouchFeature(session), cryptomator).touch( new CryptoWriteFeature<>(session, new DropboxWriteFeature(session), cryptomator), source, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(target, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(target, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -96,11 +96,11 @@ public class MoveWorkerTest extends AbstractDropboxTest { cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DropboxWriteFeature(session)), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -120,11 +120,11 @@ public class MoveWorkerTest extends AbstractDropboxTest { cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DropboxWriteFeature(session)), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -144,12 +144,12 @@ public class MoveWorkerTest extends AbstractDropboxTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); // rename file final Path fileRenamed = new Path(folder, "f1", EnumSet.of(Path.Type.file)); - new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamed)); // rename folder final Path folderRenamed = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(folder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(folderRenamed)); try { @@ -161,7 +161,7 @@ public class MoveWorkerTest extends AbstractDropboxTest { assertEquals(1, new CryptoListService(session, new DropboxListService(session), cryptomator).list(folderRenamed, new DisabledListProgressListener()).size()); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -181,11 +181,11 @@ public class MoveWorkerTest extends AbstractDropboxTest { cryptomator.getFeature(session, Write.class, new DropboxWriteFeature(session)), encryptedFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); // move file into vault - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(new DefaultFindFeature(session).find(clearFile)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -206,13 +206,13 @@ public class MoveWorkerTest extends AbstractDropboxTest { // move directory into vault final Path encryptedFolder = new Path(vault, clearFolder.getName(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, clearFile.getName(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertFalse(new DefaultFindFeature(session).find(clearFolder)); assertThrows(NotfoundException.class, () -> new DefaultFindFeature(session).find(clearFile)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -236,12 +236,12 @@ public class MoveWorkerTest extends AbstractDropboxTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move file outside vault final Path fileRenamed = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DropboxDeleteFeature(session).delete(Arrays.asList(fileRenamed, clearFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Arrays.asList(encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(fileRenamed, clearFolder), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -263,15 +263,15 @@ public class MoveWorkerTest extends AbstractDropboxTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move directory outside vault final Path directoryRenamed = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertThrows(NotfoundException.class, () -> cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DefaultFindFeature(session).find(directoryRenamed)); final Path fileRenamed = new Path(directoryRenamed, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DropboxDeleteFeature(session).delete(Arrays.asList(fileRenamed, directoryRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DropboxDeleteFeature(session)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(fileRenamed, directoryRenamed), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxAttributesFinderFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxAttributesFinderFeatureTest.java index bc4b629159..0fad6d86a3 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxAttributesFinderFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxAttributesFinderFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -49,6 +49,6 @@ public class DropboxAttributesFinderFeatureTest extends AbstractDropboxTest { assertEquals("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", attr.getChecksum().hash); assertNotEquals(-1L, attr.getModificationDate()); assertNotNull(attr.getVersionId()); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxBatchDeleteFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxBatchDeleteFeatureTest.java index 4d55c3da97..4430100e44 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxBatchDeleteFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxBatchDeleteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -40,7 +40,7 @@ public class DropboxBatchDeleteFeatureTest extends AbstractDropboxTest { @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new DropboxBatchDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxBatchDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -49,7 +49,7 @@ public class DropboxBatchDeleteFeatureTest extends AbstractDropboxTest { new DropboxWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final Path file2 = new DropboxTouchFeature(session).touch( new DropboxWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); - new DropboxBatchDeleteFeature(session).delete(Arrays.asList(file1, file2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxBatchDeleteFeature(session).delete(Arrays.asList(file1, file2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DropboxFindFeature(session).find(file1)); assertFalse(new DropboxFindFeature(session).find(file2)); } @@ -63,7 +63,7 @@ public class DropboxBatchDeleteFeatureTest extends AbstractDropboxTest { new DropboxWriteFeature(session), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final Path file2 = new DropboxTouchFeature(session).touch( new DropboxWriteFeature(session), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); - new DropboxBatchDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxBatchDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DropboxFindFeature(session).find(file1)); assertFalse(new DropboxFindFeature(session).find(file2)); assertFalse(new DropboxFindFeature(session).find(folder)); diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxCopyFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxCopyFeatureTest.java index cf5c6f5699..c81a2dc87f 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxCopyFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxCopyFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.AccessDeniedException; @@ -56,7 +56,7 @@ public class DropboxCopyFeatureTest extends AbstractDropboxTest { assertNotEquals(PathAttributes.EMPTY, copy.attributes()); assertTrue(new DropboxFindFeature(session).find(file)); assertTrue(new DropboxFindFeature(session).find(target)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -71,7 +71,7 @@ public class DropboxCopyFeatureTest extends AbstractDropboxTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new DropboxDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -87,7 +87,7 @@ public class DropboxCopyFeatureTest extends AbstractDropboxTest { assertTrue(new DropboxFindFeature(session).find(file)); assertTrue(new DropboxFindFeature(session).find(copy)); assertTrue(new DropboxFindFeature(session).find(new Path(copy, name, EnumSet.of(Path.Type.file)))); - new DropboxDeleteFeature(session).delete(Arrays.asList(directory, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(directory, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -98,7 +98,7 @@ public class DropboxCopyFeatureTest extends AbstractDropboxTest { final Path target = new Path(home, "~$f", EnumSet.of(Path.Type.file)); assertThrows(InvalidFilenameException.class, () -> feature.preflight(file, Optional.of(target))); assertThrows(AccessDeniedException.class, () -> feature.copy(file, target, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxDeleteFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxDeleteFeatureTest.java index 0c8864d66f..5b05177720 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxDeleteFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxDeleteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -39,14 +39,14 @@ public class DropboxDeleteFeatureTest extends AbstractDropboxTest { @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testDeleteFile() throws Exception { final Path file = new DropboxTouchFeature(session).touch( new DropboxWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -55,7 +55,7 @@ public class DropboxDeleteFeatureTest extends AbstractDropboxTest { new DropboxWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.volume, Path.Type.directory)), new TransferStatus()); final Path file = new DropboxTouchFeature(session).touch( new DropboxWriteFeature(session), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); - new DropboxDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DropboxFindFeature(session).find(file)); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxDirectoryFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxDirectoryFeatureTest.java index 66b56f6bcd..d5589ca7d1 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxDirectoryFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxDirectoryFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -50,6 +50,6 @@ public class DropboxDirectoryFeatureTest extends AbstractDropboxTest { new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), null); assertTrue(new DefaultFindFeature(session).find(level2)); assertTrue(new DropboxFindFeature(session).find(level2)); - new DropboxDeleteFeature(session).delete(Arrays.asList(level1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(level1), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxFindFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxFindFeatureTest.java index 7245be161d..2f523c2178 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxFindFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxFindFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; @@ -52,7 +52,7 @@ public class DropboxFindFeatureTest extends AbstractDropboxTest { new DropboxWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new DropboxFindFeature(session).find(folder)); assertFalse(new DropboxFindFeature(session).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new DropboxDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -61,6 +61,6 @@ public class DropboxFindFeatureTest extends AbstractDropboxTest { new DropboxTouchFeature(session).touch(new DropboxWriteFeature(session), file, new TransferStatus()); assertTrue(new DropboxFindFeature(session).find(file)); assertFalse(new DropboxFindFeature(session).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxListServiceTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxListServiceTest.java index efbdebe21f..69e3229c36 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxListServiceTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxListServiceTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; @@ -58,6 +58,6 @@ public class DropboxListServiceTest extends AbstractDropboxTest { assertSame(home, list.get(file).getParent()); assertTrue(list.contains(folder)); assertSame(home, list.get(folder).getParent()); - new DropboxDeleteFeature(session).delete(Arrays.asList(file, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(file, folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxLockFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxLockFeatureTest.java index 1e73f2ba7e..f2597539f7 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxLockFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxLockFeatureTest.java @@ -18,9 +18,8 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; -import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.InteroperabilityException; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.exception.UnsupportedException; @@ -53,7 +52,7 @@ public class DropboxLockFeatureTest extends AbstractDropboxTest { catch(UnsupportedException e) { // } - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) @@ -66,7 +65,7 @@ public class DropboxLockFeatureTest extends AbstractDropboxTest { assertNotNull(lock); assertEquals(lock, new DropboxAttributesFinderFeature(session).find(file).getLockId()); f.unlock(file, lock); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Ignore @@ -85,6 +84,6 @@ public class DropboxLockFeatureTest extends AbstractDropboxTest { new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final DropboxLockFeature f = new DropboxLockFeature(session); f.unlock(file, "l"); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxMoveFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxMoveFeatureTest.java index 8cc788063e..bde391bc44 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxMoveFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxMoveFeatureTest.java @@ -20,7 +20,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -67,7 +67,7 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { assertEquals(target.attributes(), new DropboxAttributesFinderFeature(session).find(target)); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, file.attributes(), targetAttributes)); assertEquals(target.attributes(), targetAttributes); - new DropboxDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -81,7 +81,7 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { new DropboxMoveFeature(session).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new DropboxFindFeature(session).find(test)); assertTrue(new DropboxFindFeature(session).find(target)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -95,7 +95,7 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { assertTrue(new DropboxFindFeature(session).find(target)); assertTrue(new DefaultFindFeature(session).find(target)); assertEquals(target.attributes(), new DropboxAttributesFinderFeature(session).find(target)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,7 +115,7 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { assertEquals(1, files.size()); assertFalse(new DropboxFindFeature(session).find(temp)); assertTrue(new DropboxFindFeature(session).find(test)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -135,7 +135,7 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { assertNotNull(list.find(new SimplePathPredicate(new Path(folder, StringUtils.upperCase(test.getName()), EnumSet.of(Path.Type.file))))); assertNull(list.find(new SimplePathPredicate(test))); assertTrue(new DropboxFindFeature(session).find(test)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -146,7 +146,7 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { final Path target = new Path(home, "~$f", EnumSet.of(Path.Type.file)); assertThrows(InvalidFilenameException.class, () -> feature.preflight(file, Optional.of(target))); assertThrows(AccessDeniedException.class, () -> feature.move(file, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -165,6 +165,6 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { final Path rename = new Path(home, StringUtils.lowerCase(name), EnumSet.of(Path.Type.file)); assertThrows(InvalidFilenameException.class, () -> new DropboxMoveFeature(session).preflight(file, Optional.of(rename))); assertThrows(ConflictException.class, () -> new DropboxMoveFeature(session).move(file, rename, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxReadFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxReadFeatureTest.java index ef2b2aa892..9a2516ce6b 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxReadFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxReadFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -77,7 +77,7 @@ public class DropboxReadFeatureTest extends AbstractDropboxTest { assertNotNull(in); in.close(); } - new DropboxDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -109,7 +109,7 @@ public class DropboxReadFeatureTest extends AbstractDropboxTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new DropboxDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -128,7 +128,7 @@ public class DropboxReadFeatureTest extends AbstractDropboxTest { final CountingInputStream in = new CountingInputStream(new DropboxReadFeature(session).read(test, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new DropboxDeleteFeature(session).delete(Arrays.asList(test, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(test, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -146,6 +146,6 @@ public class DropboxReadFeatureTest extends AbstractDropboxTest { // Only latest version assertTrue(new DropboxVersioningFeature(session).list(test, new DisabledListProgressListener()).isEmpty()); assertArrayEquals(content, IOUtils.readFully(new DropboxReadFeature(session).read(test, new TransferStatus(), ConnectionCallback.noop), content.length)); - new DropboxDeleteFeature(session).delete(Arrays.asList(test, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(test, directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxSearchFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxSearchFeatureTest.java index 42ba07496f..485220d4ca 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxSearchFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxSearchFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.exception.NotfoundException; @@ -70,6 +70,6 @@ public class DropboxSearchFeatureTest extends AbstractDropboxTest { assertTrue(result.contains(filesubdir)); assertEquals(subdir, result.find(new SimplePathPredicate(filesubdir)).getParent()); } - new DropboxDeleteFeature(session).delete(Arrays.asList(file, filesubdir, subdir), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Arrays.asList(file, filesubdir, subdir), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxTemporaryUrlProviderTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxTemporaryUrlProviderTest.java index 2391e1b86e..66a257067d 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxTemporaryUrlProviderTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxTemporaryUrlProviderTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Share; @@ -43,6 +43,6 @@ public class DropboxTemporaryUrlProviderTest extends AbstractDropboxTest { final Path file = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new DropboxTouchFeature(session).touch(new DropboxWriteFeature(session), file, new TransferStatus()); assertNotNull(provider.toDownloadUrl(file, Share.Sharee.world, null, new DisabledPasswordCallback()).getUrl()); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxTouchFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxTouchFeatureTest.java index 765c5f8459..1534cd1a24 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxTouchFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxTouchFeatureTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.exception.AccessDeniedException; @@ -61,7 +61,7 @@ public class DropboxTouchFeatureTest extends AbstractDropboxTest { new DropboxTouchFeature(session).touch(new DropboxWriteFeature(session), file, new TransferStatus()); assertTrue(new DropboxFindFeature(session).find(file)); assertTrue(new DefaultFindFeature(session).find(file)); - new DropboxDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxUploadFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxUploadFeatureTest.java index 011fb595ad..49a29231bc 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxUploadFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxUploadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.dropbox; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -61,7 +61,7 @@ public class DropboxUploadFeatureTest extends AbstractDropboxTest { status.setMime("text/plain"); final BytecountStreamListener count = new BytecountStreamListener(); final Metadata metadata = feature.upload(new DropboxWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(content.length, count.getSent()); assertTrue(status.isComplete()); assertTrue(new DropboxFindFeature(session).find(test)); @@ -69,7 +69,7 @@ public class DropboxUploadFeatureTest extends AbstractDropboxTest { assertEquals(1700638960000L, attributes.getModificationDate()); assertEquals(content.length, attributes.getSize()); assertEquals(((FileMetadata) metadata).getContentHash(), attributes.getChecksum().hash); - new DropboxDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxVersioningFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxVersioningFeatureTest.java index 81e8d2c3c8..48556ece4e 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxVersioningFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxVersioningFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.InteroperabilityException; @@ -95,8 +95,8 @@ public class DropboxVersioningFeatureTest extends AbstractDropboxTest { // Expected } for(Path version : new DropboxListService(session).list(directory, new DisabledListProgressListener())) { - new DropboxDeleteFeature(session).delete(Collections.singletonList(version), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(version), LoginCallback.noop, new Delete.DisabledCallback()); } - new DropboxDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxWriteFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxWriteFeatureTest.java index 018fc70d6e..081e24d397 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxWriteFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxWriteFeatureTest.java @@ -20,7 +20,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.AccessDeniedException; @@ -84,7 +84,7 @@ public class DropboxWriteFeatureTest extends AbstractDropboxTest { System.arraycopy(content, 1, reference, 0, content.length - 1); assertArrayEquals(reference, buffer); } - new DropboxDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -118,7 +118,7 @@ public class DropboxWriteFeatureTest extends AbstractDropboxTest { System.arraycopy(content, 1, reference, 0, content.length - 1); assertArrayEquals(reference, buffer); } - new DropboxDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = AccessDeniedException.class) diff --git a/dropbox/src/test/java/ch/cyberduck/core/worker/DropboxSingleTransferWorkerTest.java b/dropbox/src/test/java/ch/cyberduck/core/worker/DropboxSingleTransferWorkerTest.java index d4301ab2f1..d53159be0c 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/worker/DropboxSingleTransferWorkerTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/worker/DropboxSingleTransferWorkerTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AbstractDropboxTest; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -84,12 +84,12 @@ public class DropboxSingleTransferWorkerTest extends AbstractDropboxTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertArrayEquals(content, IOUtils.toByteArray(local.getInputStream())); assertEquals(checksum, new DropboxChecksumCompute().compute(local.getInputStream(), new TransferStatus())); - new DropboxDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DropboxDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/eue/src/test/java/ch/cyberduck/core/cryptomator/EueSingleUploadServiceTest.java b/eue/src/test/java/ch/cyberduck/core/cryptomator/EueSingleUploadServiceTest.java index 14f71e6071..9b893f83cc 100644 --- a/eue/src/test/java/ch/cyberduck/core/cryptomator/EueSingleUploadServiceTest.java +++ b/eue/src/test/java/ch/cyberduck/core/cryptomator/EueSingleUploadServiceTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -96,7 +96,7 @@ public class EueSingleUploadServiceTest extends AbstractEueSessionTest { final InputStream in = new CryptoReadFeature(session, new EueReadFeature(session, fileid), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/eue/src/test/java/ch/cyberduck/core/cryptomator/EueThresholdUploadServiceTest.java b/eue/src/test/java/ch/cyberduck/core/cryptomator/EueThresholdUploadServiceTest.java index df204a76dc..a9c65bb195 100644 --- a/eue/src/test/java/ch/cyberduck/core/cryptomator/EueThresholdUploadServiceTest.java +++ b/eue/src/test/java/ch/cyberduck/core/cryptomator/EueThresholdUploadServiceTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.cryptomator.features.CryptoBulkFeature; @@ -102,7 +102,7 @@ public class EueThresholdUploadServiceTest extends AbstractEueSessionTest { final InputStream in = new CryptoReadFeature(session, new EueReadFeature(session, fileid), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -139,7 +139,7 @@ public class EueThresholdUploadServiceTest extends AbstractEueSessionTest { final InputStream in = new CryptoReadFeature(session, new EueReadFeature(session, fileid), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/eue/src/test/java/ch/cyberduck/core/cryptomator/EueUploadServiceTest.java b/eue/src/test/java/ch/cyberduck/core/cryptomator/EueUploadServiceTest.java index 01aa832d94..fb51462c0d 100644 --- a/eue/src/test/java/ch/cyberduck/core/cryptomator/EueUploadServiceTest.java +++ b/eue/src/test/java/ch/cyberduck/core/cryptomator/EueUploadServiceTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.cryptomator.features.CryptoBulkFeature; @@ -103,7 +103,7 @@ public class EueUploadServiceTest extends AbstractEueSessionTest { final InputStream in = new CryptoReadFeature(session, new EueReadFeature(session, fileid), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -139,7 +139,7 @@ public class EueUploadServiceTest extends AbstractEueSessionTest { final InputStream in = new CryptoReadFeature(session, new EueReadFeature(session, fileid), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/eue/src/test/java/ch/cyberduck/core/cryptomator/EueWriteFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/cryptomator/EueWriteFeatureTest.java index 7713e90056..01b6639782 100644 --- a/eue/src/test/java/ch/cyberduck/core/cryptomator/EueWriteFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/cryptomator/EueWriteFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -92,6 +92,6 @@ public class EueWriteFeatureTest extends AbstractEueSessionTest { final InputStream in = new CryptoReadFeature(session, new EueReadFeature(session, fileid), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new EueDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueAttributesFinderFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueAttributesFinderFeatureTest.java index 48e1303aa8..4e3c36dda6 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueAttributesFinderFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueAttributesFinderFeatureTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DescriptiveUrl; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -94,7 +94,7 @@ public class EueAttributesFinderFeatureTest extends AbstractEueSessionTest { catch(NotfoundException e) { // Expected } - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -123,7 +123,7 @@ public class EueAttributesFinderFeatureTest extends AbstractEueSessionTest { assertEquals(firstLevelModificationDate, feature.find(firstlevel).getModificationDate(), 0L); assertNotEquals(rootEtag, feature.find(new Path("/", EnumSet.of(Path.Type.directory))).getETag()); assertNotEquals(rootModificationDate, feature.find(new Path("/", EnumSet.of(Path.Type.directory))).getModificationDate()); - new EueDeleteFeature(session, fileid).delete(Arrays.asList(firstlevel, secondlevel), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Arrays.asList(firstlevel, secondlevel), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueCopyFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueCopyFeatureTest.java index 5141275ede..41287fbd85 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueCopyFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueCopyFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.eue; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -68,7 +68,7 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { new EueAttributesFinderFeature(session, fileid).find(targetFile).getETag()); assertNotEquals(new EueAttributesFinderFeature(session, fileid).find(sourceFile).getFileId(), new EueAttributesFinderFeature(session, fileid).find(targetFile).getFileId()); - new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -83,7 +83,7 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { final Path targetFolder = new Path(testFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); assertNull(targetFolder.attributes().getFileId()); final EueCopyFeature feature = new EueCopyFeature(session, fileid); - feature.copy(sourceFolder, targetFolder, new TransferStatus(), new DisabledLoginCallback(), StreamListener.noop); + feature.copy(sourceFolder, targetFolder, new TransferStatus(), LoginCallback.noop, StreamListener.noop); assertNotEquals(sourceFolder.attributes().getFileId(), targetFolder.attributes().getFileId()); assertTrue(new EueFindFeature(session, fileid).find(targetFolder)); assertTrue(new EueFindFeature(session, fileid).find(new Path(targetFolder, sourceFile.getName(), sourceFile.getType()))); @@ -91,7 +91,7 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { assertTrue(new EueFindFeature(session, fileid).find(sourceFolder)); assertTrue(new EueFindFeature(session, fileid).find(sourceFile)); assertTrue(new DefaultFindFeature(session).find(sourceFile)); - new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -104,7 +104,7 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { final Path targetFolder = new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); assertNull(targetFolder.attributes().getFileId()); final EueCopyFeature feature = new EueCopyFeature(session, fileid); - feature.copy(sourceFolder, targetFolder, new TransferStatus(), new DisabledLoginCallback(), StreamListener.noop); + feature.copy(sourceFolder, targetFolder, new TransferStatus(), LoginCallback.noop, StreamListener.noop); assertNotEquals(sourceFolder.attributes().getFileId(), targetFolder.attributes().getFileId()); assertTrue(new EueFindFeature(session, fileid).find(targetFolder)); assertTrue(new EueFindFeature(session, fileid).find(new Path(targetFolder, sourceFile.getName(), sourceFile.getType()))); @@ -112,7 +112,7 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { assertTrue(new EueFindFeature(session, fileid).find(sourceFolder)); assertTrue(new EueFindFeature(session, fileid).find(sourceFile)); assertTrue(new DefaultFindFeature(session).find(sourceFile)); - new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -136,7 +136,7 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { new EueAttributesFinderFeature(session, fileid).find(targetFile).getETag()); assertNotEquals(sourceAttr.getFileId(), new EueAttributesFinderFeature(session, fileid).find(targetFile).getFileId()); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(sourceFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(sourceFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testCopyRenameFile() throws Exception { @@ -160,7 +160,7 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { new EueAttributesFinderFeature(session, fileid).find(targetFile).getChecksum()); assertNotEquals(new EueAttributesFinderFeature(session, fileid).find(sourceFile).getFileId(), new EueAttributesFinderFeature(session, fileid).find(targetFile).getFileId()); - new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -175,7 +175,7 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { final TransferStatus status = new TransferStatus().setLength(random.length); final EueWriteFeature.Chunk upload = new EueSingleUploadService(session, fileid).upload(new EueWriteFeature(session, fileid), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertNotNull(upload.getResourceId()); local.delete(); assertTrue(new EueFindFeature(session, fileid).find(test)); @@ -185,6 +185,6 @@ public class EueCopyFeatureTest extends AbstractEueSessionTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new EueDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueDeleteFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueDeleteFeatureTest.java index 3b522d5c02..b540bb7274 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueDeleteFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueDeleteFeatureTest.java @@ -19,9 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; -import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -48,7 +47,7 @@ public class EueDeleteFeatureTest extends AbstractEueSessionTest { final Path directory = new EueDirectoryFeature(session, fileid).mkdir(new EueWriteFeature(session, fileid), new Path( new AlphanumericRandomStringService().random(), EnumSet.of(AbstractPath.Type.directory)), new TransferStatus()); assertTrue(new EueFindFeature(session, fileid).find(directory, new DisabledListProgressListener())); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(directory, new DisabledListProgressListener()))); } @@ -63,11 +62,11 @@ public class EueDeleteFeatureTest extends AbstractEueSessionTest { createFile(fileid, file2, RandomUtils.nextBytes(214)); assertTrue(new EueFindFeature(session, fileid).find(file1)); assertTrue(new EueFindFeature(session, fileid).find(file2)); - new EueDeleteFeature(session, fileid).delete(Arrays.asList(file1, file2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Arrays.asList(file1, file2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); assertFalse((new EueFindFeature(session, fileid).find(file2, new DisabledListProgressListener()))); assertTrue(new EueFindFeature(session, fileid).find(folder, new DisabledListProgressListener())); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); } @@ -81,17 +80,17 @@ public class EueDeleteFeatureTest extends AbstractEueSessionTest { final Path file1 = new Path(folder, filename, EnumSet.of(Path.Type.file)); createFile(fileid, file1, RandomUtils.nextBytes(511)); assertTrue(new EueFindFeature(session, fileid).find(file1)); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file1), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); } { final Path file1 = new Path(folder, filename, EnumSet.of(Path.Type.file)); createFile(fileid, file1, RandomUtils.nextBytes(511)); assertTrue(new EueFindFeature(session, fileid).find(file1)); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file1), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); } - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); } @@ -100,7 +99,7 @@ public class EueDeleteFeatureTest extends AbstractEueSessionTest { final EueResourceIdProvider fileid = new EueResourceIdProvider(session); new EueDeleteFeature(session, fileid).delete(Collections.singletonList( new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)) - ), new DisabledLoginCallback(), new Delete.DisabledCallback()); + ), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } @@ -109,7 +108,7 @@ public class EueDeleteFeatureTest extends AbstractEueSessionTest { final EueResourceIdProvider fileid = new EueResourceIdProvider(session); new EueDeleteFeature(session, fileid).delete(Arrays.asList( new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)) - ), new DisabledLoginCallback(), new Delete.DisabledCallback()); + ), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } @@ -118,10 +117,10 @@ public class EueDeleteFeatureTest extends AbstractEueSessionTest { final EueResourceIdProvider fileid = new EueResourceIdProvider(session); final Path file = new EueTouchFeature(session, fileid).touch(new EueWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final String resourceId = file.attributes().getFileId(); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); try { new EueDeleteFeature(session, fileid).delete(Collections.singletonList( - file.withAttributes(new DefaultPathAttributes().setFileId(resourceId))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + file.withAttributes(new DefaultPathAttributes().setFileId(resourceId))), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } catch(NotfoundException e) { diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueDirectoryFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueDirectoryFeatureTest.java index 9de0b7b4b3..c75d21ee11 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueDirectoryFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueDirectoryFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.eue; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.exception.InteroperabilityException; @@ -44,7 +44,7 @@ public class EueDirectoryFeatureTest extends AbstractEueSessionTest { final Path directory = new EueDirectoryFeature(session, fileid).mkdir(new EueWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), status); assertThrows(ConflictException.class, () -> new EueDirectoryFeature(session, fileid).mkdir(new EueWriteFeature(session, fileid), directory, new TransferStatus())); assertEquals(new EueAttributesFinderFeature(session, fileid).find(directory).getFileId(), directory.attributes().getFileId()); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) @@ -65,6 +65,6 @@ public class EueDirectoryFeatureTest extends AbstractEueSessionTest { final String filename = new AlphanumericRandomStringService().random(); new EueDirectoryFeature(session, fileid).mkdir(new EueWriteFeature(session, fileid), new Path(StringUtils.capitalize(filename), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertThrows(ConflictException.class, () -> new EueDirectoryFeature(session, fileid).mkdir(new EueWriteFeature(session, fileid), new Path(StringUtils.lowerCase(filename), EnumSet.of(Path.Type.directory)), new TransferStatus())); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(new Path(StringUtils.capitalize(filename), EnumSet.of(Path.Type.directory))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(new Path(StringUtils.capitalize(filename), EnumSet.of(Path.Type.directory))), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueFindFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueFindFeatureTest.java index 21c3a8cf04..eaa6a378e8 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueFindFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueFindFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.eue; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultFindFeature; @@ -67,7 +67,7 @@ public class EueFindFeatureTest extends AbstractEueSessionTest { new EueWriteFeature(session, fileid), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new EueFindFeature(session, fileid).find(folder)); assertFalse(new EueFindFeature(session, fileid).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -77,7 +77,7 @@ public class EueFindFeatureTest extends AbstractEueSessionTest { new EueTouchFeature(session, fileid).touch(new EueWriteFeature(session, fileid), file, new TransferStatus()); assertTrue(new EueFindFeature(session, fileid).find(file)); assertFalse(new EueFindFeature(session, fileid).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -110,7 +110,7 @@ public class EueFindFeatureTest extends AbstractEueSessionTest { assertEquals(folder3TestFile.attributes().getFileId(), new EueResourceIdProvider(session).getFileId(folder3TestFile)); assertTrue(new EueFindFeature(session, fileid).find(folder3TestFile, new DisabledListProgressListener())); assertTrue(new DefaultFindFeature(session).find(folder3TestFile, new DisabledListProgressListener())); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder1), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(folder1, new DisabledListProgressListener()))); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueLargeUploadServiceTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueLargeUploadServiceTest.java index 2d988918b5..f8794a9bb9 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueLargeUploadServiceTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueLargeUploadServiceTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -66,7 +66,7 @@ public class EueLargeUploadServiceTest extends AbstractEueSessionTest { final byte[] compare = new byte[content.length]; IOUtils.readFully(new EueReadFeature(session, fileid).read(file, new TransferStatus().setLength(content.length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueListServiceTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueListServiceTest.java index 54568e7212..823125a646 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueListServiceTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueListServiceTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DescriptiveUrl; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -62,7 +62,7 @@ public class EueListServiceTest extends AbstractEueSessionTest { assertTrue(list.contains(new Path("Gelöschte Dateien", EnumSet.of(directory)).withAttributes(new DefaultPathAttributes().setFileId("TRASH")))); assertEquals(folder.attributes().getFileId(), list.find(new SimplePathPredicate(folder)).attributes().getFileId()); assertSame(root, list.find(new SimplePathPredicate(folder)).getParent()); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -123,7 +123,7 @@ public class EueListServiceTest extends AbstractEueSessionTest { assertNotNull(list.find(new SimplePathPredicate(subfolder))); assertEquals(subfolder.attributes().getFileId(), list.find(new SimplePathPredicate(subfolder)).attributes().getFileId()); assertSame(folder, list.find(new SimplePathPredicate(subfolder)).getParent()); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); assertFalse((new EueFindFeature(session, fileid).find(subfolder, new DisabledListProgressListener()))); } @@ -144,7 +144,7 @@ public class EueListServiceTest extends AbstractEueSessionTest { assertEquals(filename, list.find(new DefaultPathPredicate(file)).getName()); assertEquals(file.attributes().getFileId(), list.get(file).attributes().getFileId()); assertSame(folder, list.get(file).getParent()); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); assertFalse((new EueFindFeature(session, fileid).find(file, new DisabledListProgressListener()))); } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueMoveFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueMoveFeatureTest.java index 1505c5ef6e..4d559795aa 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueMoveFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueMoveFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.eue; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -62,7 +62,7 @@ public class EueMoveFeatureTest extends AbstractEueSessionTest { assertEquals(sourceAttr.getSize(), targetAttributes.getSize()); assertNotEquals(sourceAttr.getETag(), targetAttributes.getETag()); assertEquals(sourceAttr.getFileId(), targetAttributes.getFileId()); - new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Arrays.asList(sourceFolder, targetFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -77,7 +77,7 @@ public class EueMoveFeatureTest extends AbstractEueSessionTest { new EueMoveFeature(session, fileid).move(sourceFile, targetFile, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new EueFindFeature(session, fileid).find(sourceFile)); assertTrue(new EueFindFeature(session, fileid).find(targetFile)); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -97,7 +97,7 @@ public class EueMoveFeatureTest extends AbstractEueSessionTest { assertFalse(new EueFindFeature(session, fileid).find(sourceFolder)); assertFalse(new EueFindFeature(session, fileid).find(new Path(sourceFile).withAttributes(PathAttributes.EMPTY))); assertThrows(NotfoundException.class, () -> new DefaultFindFeature(session).find(new Path(sourceFile).withAttributes(PathAttributes.EMPTY))); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(targetFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(targetFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -121,7 +121,7 @@ public class EueMoveFeatureTest extends AbstractEueSessionTest { new EueAttributesFinderFeature(session, fileid).find(targetFile).getETag()); assertEquals(sourceAttr.getFileId(), new EueAttributesFinderFeature(session, fileid).find(targetFile).getFileId()); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(sourceFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(sourceFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -139,14 +139,14 @@ public class EueMoveFeatureTest extends AbstractEueSessionTest { new EueWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final Path file = new EueTouchFeature(session, fileid).touch(new EueWriteFeature(session, fileid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final String resourceId = file.attributes().getFileId(); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); try { new EueMoveFeature(session, fileid).move(file.withAttributes(new DefaultPathAttributes().setFileId(resourceId)), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); fail(); } finally { - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -155,7 +155,7 @@ public class EueMoveFeatureTest extends AbstractEueSessionTest { final EueResourceIdProvider fileid = new EueResourceIdProvider(session); final Path file = new EueTouchFeature(session, fileid).touch(new EueWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final String resourceId = file.attributes().getFileId(); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); new EueMoveFeature(session, fileid).move(file.withAttributes(new DefaultPathAttributes().setFileId(resourceId)), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); } @@ -167,6 +167,6 @@ public class EueMoveFeatureTest extends AbstractEueSessionTest { final Path file = new EueTouchFeature(session, fileid).touch(new EueWriteFeature(session, fileid), new Path(StringUtils.capitalize(name), EnumSet.of(Path.Type.file)), new TransferStatus()); final Path rename = new Path(StringUtils.lowerCase(name), EnumSet.of(Path.Type.file)); new EueMoveFeature(session, fileid).move(file, rename, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(rename), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(rename), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueMultipartWriteFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueMultipartWriteFeatureTest.java index c845b02d74..cb242e9278 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueMultipartWriteFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueMultipartWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.eue; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -64,7 +64,7 @@ public class EueMultipartWriteFeatureTest extends AbstractEueSessionTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -94,7 +94,7 @@ public class EueMultipartWriteFeatureTest extends AbstractEueSessionTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -127,7 +127,7 @@ public class EueMultipartWriteFeatureTest extends AbstractEueSessionTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -183,6 +183,6 @@ public class EueMultipartWriteFeatureTest extends AbstractEueSessionTest { stream.close(); assertArrayEquals(content, compare); } - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueReadFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueReadFeatureTest.java index 2f1611ff48..474b5c1dc6 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueReadFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueReadFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.eue; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -57,7 +57,7 @@ public class EueReadFeatureTest extends AbstractEueSessionTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -79,7 +79,7 @@ public class EueReadFeatureTest extends AbstractEueSessionTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -102,7 +102,7 @@ public class EueReadFeatureTest extends AbstractEueSessionTest { assertNotNull(in); in.close(); } - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueResourceIdProviderTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueResourceIdProviderTest.java index fd295b76e0..5150858733 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueResourceIdProviderTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueResourceIdProviderTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.eue; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -67,6 +67,6 @@ public class EueResourceIdProviderTest extends AbstractEueSessionTest { assertEquals(file.attributes().getFileId(), fileid.getFileId(file)); assertEquals(file.attributes().getFileId(), fileid.getFileId(new Path(StringUtils.lowerCase(file.getAbsolute()), file.getType()))); assertEquals(file.attributes().getFileId(), fileid.getFileId(new Path(StringUtils.upperCase(file.getAbsolute()), file.getType()))); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueSingleUploadServiceTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueSingleUploadServiceTest.java index f5c406c27c..a61c749178 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueSingleUploadServiceTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueSingleUploadServiceTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -78,7 +78,7 @@ public class EueSingleUploadServiceTest extends AbstractEueSessionTest { assertArrayEquals(content, compare); } // Override - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueThresholdUploadServiceTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueThresholdUploadServiceTest.java index 8e991ca823..07e0d5c722 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueThresholdUploadServiceTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueThresholdUploadServiceTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -64,7 +64,7 @@ public class EueThresholdUploadServiceTest extends AbstractEueSessionTest { final byte[] compare = new byte[length]; IOUtils.readFully(new EueReadFeature(session, fileid).read(file, new TransferStatus().setLength(length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -90,7 +90,7 @@ public class EueThresholdUploadServiceTest extends AbstractEueSessionTest { final byte[] compare = new byte[length]; IOUtils.readFully(new EueReadFeature(session, fileid).read(file, new TransferStatus().setLength(length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueTimestampFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueTimestampFeatureTest.java index 7969dab475..92a3cda8f1 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueTimestampFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueTimestampFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.eue; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -60,7 +60,7 @@ public class EueTimestampFeatureTest extends AbstractEueSessionTest { assertNotEquals(attr.getETag(), updated.getETag()); assertEquals(attr.getChecksum(), updated.getChecksum()); assertEquals(modified, new DefaultAttributesFinderFeature(session).find(file).getModificationDate()); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,6 +91,6 @@ public class EueTimestampFeatureTest extends AbstractEueSessionTest { new StreamCopier(new TransferStatus(), progress).withListener(count).transfer(in, out); assertEquals(containerModification, new EueAttributesFinderFeature(session, fileid).find(container).getModificationDate()); assertNotEquals(folderModification, new EueAttributesFinderFeature(session, fileid).find(folder).getModificationDate()); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueTrashFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueTrashFeatureTest.java index 7febe28f6f..e2113fd50e 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueTrashFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueTrashFeatureTest.java @@ -19,9 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; -import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -48,7 +47,7 @@ public class EueTrashFeatureTest extends AbstractEueSessionTest { final Path directory = new EueDirectoryFeature(session, fileid).mkdir(new EueWriteFeature(session, fileid), new Path( new AlphanumericRandomStringService().random(), EnumSet.of(AbstractPath.Type.directory)), new TransferStatus()); assertTrue(new EueFindFeature(session, fileid).find(directory, new DisabledListProgressListener())); - new EueTrashFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(directory, new DisabledListProgressListener()))); } @@ -63,11 +62,11 @@ public class EueTrashFeatureTest extends AbstractEueSessionTest { createFile(fileid, file2, RandomUtils.nextBytes(214)); assertTrue(new EueFindFeature(session, fileid).find(file1)); assertTrue(new EueFindFeature(session, fileid).find(file2)); - new EueTrashFeature(session, fileid).delete(Arrays.asList(file1, file2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Arrays.asList(file1, file2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); assertFalse((new EueFindFeature(session, fileid).find(file2, new DisabledListProgressListener()))); assertTrue(new EueFindFeature(session, fileid).find(folder, new DisabledListProgressListener())); - new EueTrashFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); } @@ -80,7 +79,7 @@ public class EueTrashFeatureTest extends AbstractEueSessionTest { createFile(fileid, file, RandomUtils.nextBytes(511)); assertTrue(new EueFindFeature(session, fileid).find(file)); assertNotNull(fileid.getFileId(file)); - new EueTrashFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); file.attributes().setFileId(null); try { fileid.getFileId(file); @@ -108,17 +107,17 @@ public class EueTrashFeatureTest extends AbstractEueSessionTest { final Path file1 = new Path(folder, filename, EnumSet.of(Path.Type.file)); createFile(fileid, file1, RandomUtils.nextBytes(511)); assertTrue(new EueFindFeature(session, fileid).find(file1)); - new EueTrashFeature(session, fileid).delete(Collections.singletonList(file1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Collections.singletonList(file1), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); } { final Path file1 = new Path(folder, filename, EnumSet.of(Path.Type.file)); createFile(fileid, file1, RandomUtils.nextBytes(511)); assertTrue(new EueFindFeature(session, fileid).find(file1)); - new EueTrashFeature(session, fileid).delete(Collections.singletonList(file1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Collections.singletonList(file1), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); } - new EueTrashFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new EueFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); } @@ -127,7 +126,7 @@ public class EueTrashFeatureTest extends AbstractEueSessionTest { final EueResourceIdProvider fileid = new EueResourceIdProvider(session); new EueTrashFeature(session, fileid).delete(Collections.singletonList( new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)) - ), new DisabledLoginCallback(), new Delete.DisabledCallback()); + ), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } @@ -136,7 +135,7 @@ public class EueTrashFeatureTest extends AbstractEueSessionTest { final EueResourceIdProvider fileid = new EueResourceIdProvider(session); new EueTrashFeature(session, fileid).delete(Arrays.asList( new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)) - ), new DisabledLoginCallback(), new Delete.DisabledCallback()); + ), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } @@ -145,11 +144,11 @@ public class EueTrashFeatureTest extends AbstractEueSessionTest { final EueResourceIdProvider fileid = new EueResourceIdProvider(session); final Path file = new EueTouchFeature(session, fileid).touch(new EueWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final String resourceId = file.attributes().getFileId(); - new EueTrashFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); try { // Skip file already in trash new EueTrashFeature(session, fileid).delete(Collections.singletonList( - file.withAttributes(new DefaultPathAttributes().setFileId(resourceId))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + file.withAttributes(new DefaultPathAttributes().setFileId(resourceId))), LoginCallback.noop, new Delete.DisabledCallback()); } catch(NotfoundException e) { fail(); @@ -162,13 +161,13 @@ public class EueTrashFeatureTest extends AbstractEueSessionTest { final Path file = new EueTouchFeature(session, fileid).touch(new EueWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final String resourceId = file.attributes().getFileId(); final EueTrashFeature feature = new EueTrashFeature(session, fileid); - feature.delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + feature.delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); final Path trash = new Path("Gelöschte Dateien", EnumSet.of(directory, placeholder)); trash.withAttributes(new EueAttributesFinderFeature(session, fileid).find(trash)); assertFalse(feature.isSupported(trash)); final Path trashed = new Path(trash, file.getName(), EnumSet.of(Path.Type.file)); assertTrue(new EueFindFeature(session, fileid).find(trashed)); - new EueTrashFeature(session, fileid).delete(Collections.singletonList(trashed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueTrashFeature(session, fileid).delete(Collections.singletonList(trashed), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new EueFindFeature(session, fileid).find(trashed)); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueUploadServiceTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueUploadServiceTest.java index 87c74297c0..788c592022 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueUploadServiceTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueUploadServiceTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -64,7 +64,7 @@ public class EueUploadServiceTest extends AbstractEueSessionTest { final byte[] compare = new byte[content.length]; IOUtils.readFully(new EueReadFeature(session, fileid).read(file, new TransferStatus().setLength(content.length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/eue/src/test/java/ch/cyberduck/core/eue/EueWriteFeatureTest.java b/eue/src/test/java/ch/cyberduck/core/eue/EueWriteFeatureTest.java index c5e9e839b3..4e71751eb1 100644 --- a/eue/src/test/java/ch/cyberduck/core/eue/EueWriteFeatureTest.java +++ b/eue/src/test/java/ch/cyberduck/core/eue/EueWriteFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.eue.io.swagger.client.model.UploadType; @@ -67,7 +67,7 @@ public class EueWriteFeatureTest extends AbstractEueSessionTest { assertEquals(content.length, count.getSent()); in.close(); out.close(); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = TransferStatusCanceledException.class) @@ -107,7 +107,7 @@ public class EueWriteFeatureTest extends AbstractEueSessionTest { assertNotNull(out); new StreamCopier(status, status).transfer(new ByteArrayInputStream(content), out); assertFalse(new DefaultFindFeature(session).find(test)); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -179,7 +179,7 @@ public class EueWriteFeatureTest extends AbstractEueSessionTest { stream.close(); assertArrayEquals(content, compare); } - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -204,7 +204,7 @@ public class EueWriteFeatureTest extends AbstractEueSessionTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -224,7 +224,7 @@ public class EueWriteFeatureTest extends AbstractEueSessionTest { in.close(); out.close(); assertTrue(new DefaultFindFeature(session).find(file)); - new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new EueDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = QuotaException.class) diff --git a/freenet/src/main/java/ch/cyberduck/core/freenet/FreenetAuthenticatedUrlProvider.java b/freenet/src/main/java/ch/cyberduck/core/freenet/FreenetAuthenticatedUrlProvider.java index 0cc12d1650..579329bebe 100644 --- a/freenet/src/main/java/ch/cyberduck/core/freenet/FreenetAuthenticatedUrlProvider.java +++ b/freenet/src/main/java/ch/cyberduck/core/freenet/FreenetAuthenticatedUrlProvider.java @@ -19,10 +19,10 @@ import ch.cyberduck.core.CertificateStoreFactory; import ch.cyberduck.core.DescriptiveUrl; import ch.cyberduck.core.DisabledCertificateIdentityCallback; import ch.cyberduck.core.DisabledCertificateTrustCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledTranscriptListener; import ch.cyberduck.core.Host; import ch.cyberduck.core.HostPasswordStore; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.PasswordStoreFactory; import ch.cyberduck.core.WebUrlProvider; import ch.cyberduck.core.dav.DAVSSLProtocol; @@ -84,7 +84,7 @@ public class FreenetAuthenticatedUrlProvider implements WebUrlProvider { CertificateStoreFactory.get()); final CloseableHttpClient client = new HttpConnectionPoolBuilder( target, new ThreadLocalHostnameDelegatingTrustManager(trust, target.getHostname()), key, ProxyFactory.get() - ).build(ProxyFactory.get(), new DisabledTranscriptListener(), new DisabledLoginCallback()) + ).build(ProxyFactory.get(), new DisabledTranscriptListener(), LoginCallback.noop) .setUserAgent(new FreenetUserAgentProvider().get()) .build(); final String username = bookmark.getCredentials().getUsername(); diff --git a/freenet/src/test/java/ch/cyberduck/core/freenet/AbstractFreenetTest.java b/freenet/src/test/java/ch/cyberduck/core/freenet/AbstractFreenetTest.java index e205d68b13..8c59bde8e6 100644 --- a/freenet/src/test/java/ch/cyberduck/core/freenet/AbstractFreenetTest.java +++ b/freenet/src/test/java/ch/cyberduck/core/freenet/AbstractFreenetTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.freenet; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProgressListener; @@ -53,7 +53,7 @@ public class AbstractFreenetTest extends VaultTest { PROPERTIES.get("freenet.user") )); session = new FreenetSession(host, new DefaultX509TrustManager(), new DefaultX509KeyManager()); - final LoginConnectionService login = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), + final LoginConnectionService login = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new TestPasswordStore(), ProgressListener.noop); login.check(session, CancelCallback.noop); } diff --git a/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetAttributesFinderFeatureTest.java b/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetAttributesFinderFeatureTest.java index b71384708f..72c3eb53c5 100644 --- a/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetAttributesFinderFeatureTest.java +++ b/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetAttributesFinderFeatureTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.freenet; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.dav.DAVAttributesFinderFeature; @@ -57,7 +57,7 @@ public class FreenetAttributesFinderFeatureTest extends AbstractFreenetTest { // Expected } finally { - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -70,6 +70,6 @@ public class FreenetAttributesFinderFeatureTest extends AbstractFreenetTest { assertNotEquals(PathAttributes.EMPTY, attributes); assertEquals(TransferStatus.UNKNOWN_LENGTH, attributes.getSize()); assertNotEquals(-1L, attributes.getModificationDate()); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetFindFeatureTest.java b/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetFindFeatureTest.java index 3139ef2bb8..e47799066e 100644 --- a/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetFindFeatureTest.java +++ b/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetFindFeatureTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.freenet; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.dav.DAVDeleteFeature; import ch.cyberduck.core.dav.DAVDirectoryFeature; @@ -41,7 +41,7 @@ public class FreenetFindFeatureTest extends AbstractFreenetTest { final Path test = new DAVTouchFeature(session).touch(new DAVWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new DAVFindFeature(session).find(test)); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -49,7 +49,7 @@ public class FreenetFindFeatureTest extends AbstractFreenetTest { final Path test = new DAVDirectoryFeature(session).mkdir(new DAVWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new DAVFindFeature(session).find(test)); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetTimestampFeatureTest.java b/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetTimestampFeatureTest.java index a386943b74..fa15202877 100644 --- a/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetTimestampFeatureTest.java +++ b/freenet/src/test/java/ch/cyberduck/core/freenet/FreenetTimestampFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.freenet; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.dav.DAVAttributesFinderFeature; import ch.cyberduck.core.dav.DAVDeleteFeature; @@ -48,6 +48,6 @@ public class FreenetTimestampFeatureTest extends AbstractFreenetTest { new DAVTimestampFeature(session).setTimestamp(file, 5000L); assertEquals(5000L, new DAVAttributesFinderFeature(session).find(file).getModificationDate()); assertEquals(5000L, new DefaultAttributesFinderFeature(session).find(file).getModificationDate()); - new DAVDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index c12973cc32..6cbcd2e7b0 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -91,8 +91,8 @@ public class CopyWorkerTest extends AbstractFTPTest { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(new ByteArrayInputStream(content), new CryptoWriteFeature<>(session, new FTPWriteFeature(session), cryptomator).write(source, status.setLength(content.length), ConnectionCallback.noop)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(copySession, registry), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); @@ -102,7 +102,7 @@ public class CopyWorkerTest extends AbstractFTPTest { assertEquals(content.length, IOUtils.copy(in, out)); assertArrayEquals(content, out.toByteArray()); in.close(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -123,14 +123,14 @@ public class CopyWorkerTest extends AbstractFTPTest { new CryptoWriteFeature<>(session, new FTPWriteFeature(session), cryptomator), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(copySession, registry), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -152,14 +152,14 @@ public class CopyWorkerTest extends AbstractFTPTest { new CryptoWriteFeature<>(session, new FTPWriteFeature(session), cryptomator), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(copySession, registry), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -181,8 +181,8 @@ public class CopyWorkerTest extends AbstractFTPTest { // copy file final Path fileRenamed = new Path(folder, "f1", EnumSet.of(Path.Type.file)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); new CopyWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(copySession, registry), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop).run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamed)); @@ -194,7 +194,7 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -216,14 +216,14 @@ public class CopyWorkerTest extends AbstractFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); // copy file into vault final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(cleartextFile, encryptedFile), new SessionPool.SingleSessionPool(copySession, registry), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(new DefaultFindFeature(session).find(cleartextFile)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -245,8 +245,8 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path encryptedFolder = new Path(vault, cleartextFolder.getName(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, cleartextFile.getName(), EnumSet.of(Path.Type.file)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(cleartextFolder, encryptedFolder), new SessionPool.SingleSessionPool(copySession, registry), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); @@ -254,7 +254,7 @@ public class CopyWorkerTest extends AbstractFTPTest { assertTrue(new DefaultFindFeature(session).find(cleartextFolder)); assertTrue(new DefaultFindFeature(session).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -278,14 +278,14 @@ public class CopyWorkerTest extends AbstractFTPTest { // move file outside vault final Path cleartextFile = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(encryptedFile, cleartextFile), new SessionPool.SingleSessionPool(copySession, registry), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DefaultFindFeature(session).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); } @Test @@ -307,8 +307,8 @@ public class CopyWorkerTest extends AbstractFTPTest { // copy directory outside vault final Path cleartextFolder = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(encryptedFolder, cleartextFolder), new SessionPool.SingleSessionPool(copySession, registry), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); @@ -317,6 +317,6 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/CryptoFTPSingleTransferWorkerTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/CryptoFTPSingleTransferWorkerTest.java index cf8286065c..fbe9293fbd 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/CryptoFTPSingleTransferWorkerTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/CryptoFTPSingleTransferWorkerTest.java @@ -17,10 +17,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -101,7 +101,7 @@ public class CryptoFTPSingleTransferWorkerTest extends AbstractFTPTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(dir1)); @@ -119,7 +119,7 @@ public class CryptoFTPSingleTransferWorkerTest extends AbstractFTPTest { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPDirectoryFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPDirectoryFeatureTest.java index ea4c791fdd..feaa3c5626 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPDirectoryFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPDirectoryFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Directory; @@ -67,7 +67,7 @@ public class FTPDirectoryFeatureTest extends AbstractFTPTest { cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), testdirectory2, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(testdirectory2)); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(testfile2)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(testdirectory2, testdirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(testdirectory2, testdirectory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -82,6 +82,6 @@ public class FTPDirectoryFeatureTest extends AbstractFTPTest { cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPListServiceTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPListServiceTest.java index 8eefa27144..a5c76bbf86 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPListServiceTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPListServiceTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.Cache; import ch.cyberduck.core.CachingFindFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.cryptomator.features.CryptoFindFeature; @@ -101,6 +101,6 @@ public class FTPListServiceTest extends AbstractFTPTest { assertTrue(f.getType().contains(Path.Type.decrypted)); } } - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPMoveFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPMoveFeatureTest.java index 41125f8b57..7939d4384b 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPMoveFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPMoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -82,6 +82,6 @@ public class FTPMoveFeatureTest extends AbstractFTPTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList( - fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPTouchFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPTouchFeatureTest.java index 64d7d458c0..1e3ad158e7 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPTouchFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPTouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -68,7 +68,7 @@ public class FTPTouchFeatureTest extends AbstractFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); assertEquals(0L, cryptomator.getFeature(session, AttributesFinder.class, new FTPAttributesFinderFeature(session)).find(test).getSize()); assertEquals(0L, cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session)).find(test).getSize()); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -84,7 +84,7 @@ public class FTPTouchFeatureTest extends AbstractFTPTest { new CryptoWriteFeature<>(session, new FTPWriteFeature(session), cryptomator), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)), status); assertEquals(TransferStatus.UNKNOWN_LENGTH, test.attributes().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -100,6 +100,6 @@ public class FTPTouchFeatureTest extends AbstractFTPTest { new CryptoWriteFeature<>(session, new FTPWriteFeature(session), cryptomator), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)), status); assertEquals(TransferStatus.UNKNOWN_LENGTH, test.attributes().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPWriteFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPWriteFeatureTest.java index d09aef3038..98ce24d70f 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPWriteFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -93,6 +93,6 @@ public class FTPWriteFeatureTest extends AbstractFTPTest { final InputStream in = new CryptoReadFeature(session, new FTPReadFeature(session), cryptomator).read(test, new TransferStatus(), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 241b1d2073..d27724dca3 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -80,11 +80,11 @@ public class MoveWorkerTest extends AbstractFTPTest { session), cryptomator).touch( cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), source, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(target, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(target, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -105,11 +105,11 @@ public class MoveWorkerTest extends AbstractFTPTest { cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), - PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -131,11 +131,11 @@ public class MoveWorkerTest extends AbstractFTPTest { cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(sourceFolder, target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(sourceFolder, target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -155,12 +155,12 @@ public class MoveWorkerTest extends AbstractFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); // rename file final Path fileRenamed = new Path(folder, "f1", EnumSet.of(Path.Type.file)); - new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamed)); // rename folder final Path folderRenamed = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(folder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(folderRenamed)); try { @@ -171,7 +171,7 @@ public class MoveWorkerTest extends AbstractFTPTest { } assertEquals(1, new CryptoListService(session, new FTPListService(session), cryptomator).list(folderRenamed, new DisabledListProgressListener()).size()); cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList( - new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)), folderRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)), folderRenamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -193,13 +193,13 @@ public class MoveWorkerTest extends AbstractFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); // move file into vault final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(new DefaultFindFeature(session).find(clearFile)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -221,15 +221,15 @@ public class MoveWorkerTest extends AbstractFTPTest { final Path encryptedFolder = new Path(vault, clearFolder.getName(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, clearFile.getName(), EnumSet.of(Path.Type.file)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertFalse(new DefaultFindFeature(session).find(clearFolder)); assertThrows(NotfoundException.class, () -> new DefaultFindFeature(session).find(clearFile)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -254,14 +254,14 @@ public class MoveWorkerTest extends AbstractFTPTest { // move file outside vault final Path fileRenamed = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new FTPDeleteFeature(session).delete(Arrays.asList(fileRenamed, clearFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Arrays.asList(encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Arrays.asList(fileRenamed, clearFolder), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -284,17 +284,17 @@ public class MoveWorkerTest extends AbstractFTPTest { // move directory outside vault final Path directoryRenamed = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertThrows(NotfoundException.class, () -> new DefaultFindFeature(session).find(encryptedFile)); assertTrue(new DefaultFindFeature(session).find(directoryRenamed)); final Path fileRenamed = new Path(directoryRenamed, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new FTPDeleteFeature(session).delete(Arrays.asList(fileRenamed, directoryRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new FTPDeleteFeature(session)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Arrays.asList(fileRenamed, directoryRenamed), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/DataConnectionActionExecutorTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/DataConnectionActionExecutorTest.java index eb17675621..574c759bf4 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/DataConnectionActionExecutorTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/DataConnectionActionExecutorTest.java @@ -19,8 +19,8 @@ package ch.cyberduck.core.ftp; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.preferences.PreferencesFactory; @@ -55,10 +55,10 @@ public class DataConnectionActionExecutorTest extends AbstractFTPTest { final AtomicInteger count = new AtomicInteger(); final FTPSession session = new FTPSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); session.getClient().setDefaultTimeout(2000); session.getClient().setConnectTimeout(2000); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path file = new Path("/pub/debian/README.html", EnumSet.of(Path.Type.file)); final TransferStatus status = new TransferStatus(); final DataConnectionAction action = new DataConnectionAction() { diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPAttributesFinderFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPAttributesFinderFeatureTest.java index 00d78c1736..63bad60182 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPAttributesFinderFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPAttributesFinderFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.ftp; */ import ch.cyberduck.core.Attributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.InteroperabilityException; @@ -61,6 +61,6 @@ public class FTPAttributesFinderFeatureTest extends AbstractFTPTest { catch(NotfoundException | InteroperabilityException e) { // Expected } - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPDeleteFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPDeleteFeatureTest.java index 71cf9bf149..00d2714ddf 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPDeleteFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPDeleteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.ftp; * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.AccessDeniedException; import ch.cyberduck.core.exception.NotfoundException; @@ -41,7 +41,7 @@ public class FTPDeleteFeatureTest extends AbstractFTPTest { public void testDeleteNotFound() throws Exception { final Path test = new Path(new FTPWorkdirService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); try { - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } catch(NotfoundException | AccessDeniedException e) { @@ -53,6 +53,6 @@ public class FTPDeleteFeatureTest extends AbstractFTPTest { public void testDeleteDirectory() throws Exception { final Path test = new Path(new FTPWorkdirService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new FTPDirectoryFeature(session).mkdir(new FTPWriteFeature(session), test, new TransferStatus()); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPDirectoryFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPDirectoryFeatureTest.java index 02ee39fe46..97290a1736 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPDirectoryFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPDirectoryFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.ftp; * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -43,7 +43,7 @@ public class FTPDirectoryFeatureTest extends AbstractFTPTest { new FTPDirectoryFeature(session).mkdir(new FTPWriteFeature(session), test, new TransferStatus()); assertTrue(session.getFeature(Find.class).find(test)); assertThrows(ConflictException.class, () -> new FTPDirectoryFeature(session).mkdir(new FTPWriteFeature(session), test, new TransferStatus())); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPFindFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPFindFeatureTest.java index 9f59ef8153..ebe0eaf8f8 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPFindFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.ftp; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; @@ -52,7 +52,7 @@ public class FTPFindFeatureTest extends AbstractFTPTest { new FTPTouchFeature(session).touch(new FTPWriteFeature(session), file, new TransferStatus()); assertTrue(new FTPFindFeature(session).find(file)); assertFalse(new FTPFindFeature(session).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMDTMTimestampFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMDTMTimestampFeatureTest.java index 109d1ecc8b..054693661f 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMDTMTimestampFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMDTMTimestampFeatureTest.java @@ -15,7 +15,7 @@ package ch.cyberduck.core.ftp; * GNU General Public License for more details. */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.features.Delete; @@ -41,6 +41,6 @@ public class FTPMDTMTimestampFeatureTest extends AbstractFTPTest { final Path test = new Path(new FTPWorkdirService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new FTPTouchFeature(session).touch(new FTPWriteFeature(session), test, new TransferStatus()); assertThrows(BackgroundException.class, () -> new FTPMDTMTimestampFeature(session).setTimestamp(test, modified)); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMFMTTimestampFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMFMTTimestampFeatureTest.java index 41fd053a02..53cd068e4b 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMFMTTimestampFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMFMTTimestampFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.ftp; */ import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.ftp.list.FTPListService; @@ -45,6 +45,6 @@ public class FTPMFMTTimestampFeatureTest extends AbstractFTPTest { new FTPTouchFeature(session).touch(new FTPWriteFeature(session), test, new TransferStatus()); new FTPMFMTTimestampFeature(session).setTimestamp(test, modified); assertEquals(modified / 1000 * 1000, new FTPListService(session).list(home, new DisabledListProgressListener()).get(test).attributes().getModificationDate()); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMoveFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMoveFeatureTest.java index fba4dd4236..1983f8ab0c 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMoveFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPMoveFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.ftp; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.AccessDeniedException; import ch.cyberduck.core.exception.NotfoundException; @@ -49,7 +49,7 @@ public class FTPMoveFeatureTest extends AbstractFTPTest { new FTPMoveFeature(session).move(test, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(session.getFeature(Find.class).find(test)); assertTrue(session.getFeature(Find.class).find(target)); - new FTPDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -69,7 +69,7 @@ public class FTPMoveFeatureTest extends AbstractFTPTest { new FTPMoveFeature(session).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(session.getFeature(Find.class).find(test)); assertTrue(session.getFeature(Find.class).find(target)); - new FTPDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPReadFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPReadFeatureTest.java index e37cbeb22d..3d239e81e3 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPReadFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPReadFeatureTest.java @@ -20,7 +20,7 @@ package ch.cyberduck.core.ftp; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -77,7 +77,7 @@ public class FTPReadFeatureTest extends AbstractFTPTest { in.close(); assertArrayEquals(content, buffer.toByteArray()); } - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -103,7 +103,7 @@ public class FTPReadFeatureTest extends AbstractFTPTest { final byte[] reference = new byte[(int) limit]; System.arraycopy(content, (int) offset, reference, 0, (int) limit); assertArrayEquals(reference, download.toByteArray()); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -119,7 +119,7 @@ public class FTPReadFeatureTest extends AbstractFTPTest { in.close(); // Make sure subsequent PWD command works assertEquals(workdir, new FTPWorkdirService(session).find()); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -141,7 +141,7 @@ public class FTPReadFeatureTest extends AbstractFTPTest { in.close(); // Make sure subsequent PWD command works assertEquals(workdir, new FTPWorkdirService(session).find()); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -157,6 +157,6 @@ public class FTPReadFeatureTest extends AbstractFTPTest { in.close(); // Read timeout in.close(); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPSessionTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPSessionTest.java index f1c79b636b..9d29dbc48b 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPSessionTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPSessionTest.java @@ -6,9 +6,9 @@ import ch.cyberduck.core.DisabledCertificateIdentityCallback; import ch.cyberduck.core.DisabledCertificateStore; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordStore; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -70,7 +70,7 @@ public class FTPSessionTest extends AbstractFTPTest { )); final FTPSession session = new FTPSession(host); final LoginConnectionService c = new LoginConnectionService( - new DisabledLoginCallback(), + LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop, @@ -103,7 +103,7 @@ public class FTPSessionTest extends AbstractFTPTest { final Path test = new Path(new FTPWorkdirService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new FTPTouchFeature(session).touch(new FTPWriteFeature(session), test, new TransferStatus()); assertTrue(session.getFeature(Find.class).find(test)); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); } @@ -131,7 +131,7 @@ public class FTPSessionTest extends AbstractFTPTest { throw failure; } }; - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); assertEquals(Session.State.open, session.getState()); try { session.close(); @@ -160,7 +160,7 @@ public class FTPSessionTest extends AbstractFTPTest { } })); final LoginConnectionService c = new LoginConnectionService( - new DisabledLoginCallback(), + LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUTIMETimestampFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUTIMETimestampFeatureTest.java index 34430a0a26..a46a4cab8b 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUTIMETimestampFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUTIMETimestampFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.ftp; * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.features.Delete; @@ -41,6 +41,6 @@ public class FTPUTIMETimestampFeatureTest extends AbstractFTPTest { final Path test = new Path(workdir.find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new FTPTouchFeature(session).touch(new FTPWriteFeature(session), test, new TransferStatus()); new FTPUTIMETimestampFeature(session).setTimestamp(test, modified); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUnixPermissionFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUnixPermissionFeatureTest.java index e7c2d67b49..b8c26fba14 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUnixPermissionFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUnixPermissionFeatureTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.ftp; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Permission; import ch.cyberduck.core.exception.InteroperabilityException; @@ -30,6 +30,6 @@ public class FTPUnixPermissionFeatureTest extends AbstractFTPTest { new FTPTouchFeature(session).touch(new FTPWriteFeature(session), test, new TransferStatus()); new FTPUnixPermissionFeature(session).setUnixPermission(test, new Permission(666)); assertEquals("666", new FTPListService(session).list(home, new DisabledListProgressListener()).get(test).attributes().getPermission().getMode()); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUploadFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUploadFeatureTest.java index 1fb7a8ceff..0b8be4aebc 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUploadFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPUploadFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.ftp; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -35,6 +35,6 @@ public class FTPUploadFeatureTest extends AbstractFTPTest { final Path f = new Path(new FTPWorkdirService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new FTPTouchFeature(session).touch(new FTPWriteFeature(session), f, new TransferStatus()); assertTrue(new FTPUploadFeature(session).append(f, new TransferStatus().setExists(true).setLength(0L).setRemote(new FTPAttributesFinderFeature(session).find(f))).append); - new FTPDeleteFeature(session).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(f), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPWriteFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPWriteFeatureTest.java index c2d20060f6..1932cb999b 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/FTPWriteFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/FTPWriteFeatureTest.java @@ -3,7 +3,7 @@ package ch.cyberduck.core.ftp; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.AccessDeniedException; @@ -65,7 +65,7 @@ public class FTPWriteFeatureTest extends AbstractFTPTest { System.arraycopy(content, 1, reference, 0, content.length - 1); assertArrayEquals(reference, buffer); } - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -96,7 +96,7 @@ public class FTPWriteFeatureTest extends AbstractFTPTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); IOUtils.copy(new FTPReadFeature(session).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out); assertArrayEquals(content, out.toByteArray()); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -133,7 +133,7 @@ public class FTPWriteFeatureTest extends AbstractFTPTest { assertArrayEquals(content, out.toByteArray()); assertTrue(new DefaultFindFeature(session).find(test)); assertEquals(content.length, new DefaultAttributesFinderFeature(session).find(test).getSize()); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Ignore diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPDefaultListServiceTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPDefaultListServiceTest.java index d2ea373a97..e6ecf448f8 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPDefaultListServiceTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPDefaultListServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.ftp.list; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.ftp.AbstractFTPTest; @@ -50,7 +50,7 @@ public class FTPDefaultListServiceTest extends AbstractFTPTest { final Path file = new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new FTPTouchFeature(session).touch(new FTPWriteFeature(session), file, new TransferStatus()); assertTrue(list.list(directory, new DisabledListProgressListener()).contains(file)); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -61,6 +61,6 @@ public class FTPDefaultListServiceTest extends AbstractFTPTest { final Path file = new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new FTPTouchFeature(session).touch(new FTPWriteFeature(session), file, new TransferStatus()); assertTrue(list.list(directory, new DisabledListProgressListener()).contains(file)); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPListServiceTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPListServiceTest.java index 1bdd5b2db9..35efb50422 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPListServiceTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPListServiceTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.ftp.list; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.ConnectionTimeoutException; @@ -62,7 +62,7 @@ public class FTPListServiceTest extends AbstractFTPTest { } }); assertTrue(list.contains(file)); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -81,7 +81,7 @@ public class FTPListServiceTest extends AbstractFTPTest { } }); assertTrue(list.contains(file)); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -102,7 +102,7 @@ public class FTPListServiceTest extends AbstractFTPTest { } }).isEmpty()); assertTrue(callback.get()); - new FTPDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = ConnectionTimeoutException.class) diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPMlsdListServiceTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPMlsdListServiceTest.java index c682b25af8..50fd39d2a0 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPMlsdListServiceTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPMlsdListServiceTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.ftp.list; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.ftp.AbstractFTPTest; @@ -49,7 +49,7 @@ public class FTPMlsdListServiceTest extends AbstractFTPTest { new FTPTouchFeature(session).touch(new FTPWriteFeature(session), file, new TransferStatus()); final AttributedList list = service.list(directory, new DisabledListProgressListener()); assertTrue(list.contains(file)); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPStatListServiceTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPStatListServiceTest.java index 02121089f7..a3a083dc96 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPStatListServiceTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/list/FTPStatListServiceTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.ftp.list; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.ftp.AbstractFTPTest; @@ -57,7 +57,7 @@ public class FTPStatListServiceTest extends AbstractFTPTest { new FTPTouchFeature(session).touch(new FTPWriteFeature(session), file, new TransferStatus()); final AttributedList list = service.list(directory, new DisabledListProgressListener()); assertTrue(list.contains(file)); - new FTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/ftp/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java index 3231fc74a7..3c1cf134bd 100644 --- a/ftp/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.shared; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.ftp.AbstractFTPTest; @@ -84,6 +84,6 @@ public class DefaultDownloadFeatureTest extends AbstractFTPTest { in.close(); assertArrayEquals(content, buffer); final Delete delete = session.getFeature(Delete.class); - delete.delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/shared/DefaultUploadFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/shared/DefaultUploadFeatureTest.java index 25832ec9ba..d443682fd9 100644 --- a/ftp/src/test/java/ch/cyberduck/core/shared/DefaultUploadFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/shared/DefaultUploadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.shared; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -77,7 +77,7 @@ public class DefaultUploadFeatureTest extends AbstractFTPTest { in.close(); assertArrayEquals(content, buffer); final Delete delete = session.getFeature(Delete.class); - delete.delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java b/ftp/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java index 5c2b586f86..e44b70896d 100644 --- a/ftp/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -57,13 +57,13 @@ public class CopyWorkerTest extends AbstractFTPTest { new FTPTouchFeature(session).touch(new FTPWriteFeature(session), source, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(source)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(new DefaultFindFeature(session).find(source)); assertTrue(new DefaultFindFeature(session).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(source, target), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(source, target), ProgressListener.noop).run(session); } @Test @@ -78,13 +78,13 @@ public class CopyWorkerTest extends AbstractFTPTest { assertTrue(new DefaultFindFeature(session).find(targetFolder)); // copy file into vault final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(sourceFile, targetFile), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(new DefaultFindFeature(session).find(sourceFile)); assertTrue(new DefaultFindFeature(session).find(targetFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); } @Test @@ -100,14 +100,14 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path targetFolder = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path targetFile = new Path(targetFolder, sourceFile.getName(), EnumSet.of(Path.Type.file)); final FTPSession copySession = new FTPSession(new Host(session.getHost()).setCredentials(new Credentials("test", "test"))); - copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - copySession.login(new DisabledLoginCallback(), CancelCallback.noop); + copySession.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + copySession.login(LoginCallback.noop, CancelCallback.noop); final CopyWorker worker = new CopyWorker(Collections.singletonMap(folder, targetFolder), new SessionPool.SingleSessionPool(copySession), PathCache.empty(), ProgressListener.noop, ConnectionCallback.noop); worker.run(session); assertTrue(new DefaultFindFeature(session).find(targetFolder)); assertTrue(new DefaultFindFeature(session).find(targetFile)); assertTrue(new DefaultFindFeature(session).find(folder)); assertTrue(new DefaultFindFeature(session).find(sourceFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(folder, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(folder, targetFolder), ProgressListener.noop).run(session); } } diff --git a/ftp/src/test/java/ch/cyberduck/core/worker/FTPConcurrentTransferWorkerTest.java b/ftp/src/test/java/ch/cyberduck/core/worker/FTPConcurrentTransferWorkerTest.java index 636935b24f..b0a6febdac 100644 --- a/ftp/src/test/java/ch/cyberduck/core/worker/FTPConcurrentTransferWorkerTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/worker/FTPConcurrentTransferWorkerTest.java @@ -91,7 +91,7 @@ public class FTPConcurrentTransferWorkerTest extends AbstractFTPTest { }; final Transfer t = new UploadTransfer(host, test, local); final BytecountStreamListener counter = new BytecountStreamListener(); - final LoginConnectionService connect = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); + final LoginConnectionService connect = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); final DefaultSessionPool pool = new DefaultSessionPool(connect, new DefaultVaultRegistry(new DisabledPasswordCallback()), new DisabledTranscriptListener(), host, new GenericObjectPool<>(new PooledSessionFactory(connect, new DisabledX509TrustManager(), new DefaultX509KeyManager(), @@ -159,7 +159,7 @@ public class FTPConcurrentTransferWorkerTest extends AbstractFTPTest { assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); assertTrue(failed.get()); - new FTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new FTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -182,7 +182,7 @@ public class FTPConcurrentTransferWorkerTest extends AbstractFTPTest { }; final Transfer transfer = new UploadTransfer(host, list); final DefaultSessionPool pool = new DefaultSessionPool( - new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), new DisabledPasswordStore(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop), new DisabledX509TrustManager(), new DefaultX509KeyManager(), new DefaultVaultRegistry(new DisabledPasswordCallback()), new DisabledTranscriptListener(), host); @@ -194,7 +194,7 @@ public class FTPConcurrentTransferWorkerTest extends AbstractFTPTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - new DisabledLoginCallback(), ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() + LoginCallback.noop, ProgressListener.noop, StreamListener.noop, new DisabledNotificationService() ); pool.withMaxTotal(connections); final Session session = worker.borrow(ConcurrentTransferWorker.Connection.source); diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 240e7f54fc..5792767fd3 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -96,7 +96,7 @@ public class CopyWorkerTest extends AbstractDriveTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new DriveReadFeature(session, fileid), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -122,7 +122,7 @@ public class CopyWorkerTest extends AbstractDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -149,7 +149,7 @@ public class CopyWorkerTest extends AbstractDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -182,7 +182,7 @@ public class CopyWorkerTest extends AbstractDriveTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -208,7 +208,7 @@ public class CopyWorkerTest extends AbstractDriveTest { assertTrue(new DriveFindFeature(session, fileid).find(cleartextFile)); assertTrue(cryptomator.getFeature(session, Find.class, new DriveFindFeature(session, fileid)).find(encryptedFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -236,7 +236,7 @@ public class CopyWorkerTest extends AbstractDriveTest { assertTrue(new DriveFindFeature(session, fileid).find(cleartextFolder)); assertTrue(new DriveFindFeature(session, fileid).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -265,7 +265,7 @@ public class CopyWorkerTest extends AbstractDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DriveFindFeature(session, fileid)).find(encryptedFile)); assertTrue(new DriveFindFeature(session, fileid).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); } @Test @@ -295,6 +295,6 @@ public class CopyWorkerTest extends AbstractDriveTest { final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new DriveFindFeature(session, fileid).find(fileRenamed)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoDriveTransferWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoDriveTransferWorkerTest.java index f31b4f7de9..303f453d0d 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoDriveTransferWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoDriveTransferWorkerTest.java @@ -17,10 +17,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -101,7 +101,7 @@ public class CryptoDriveTransferWorkerTest extends AbstractDriveTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); Assert.assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(dir1)); @@ -120,7 +120,7 @@ public class CryptoDriveTransferWorkerTest extends AbstractDriveTest { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); Assert.assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveAttributesFinderFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveAttributesFinderFeatureTest.java index 9b0915f23c..0498540298 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveAttributesFinderFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveAttributesFinderFeatureTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.Cache; import ch.cyberduck.core.CachingAttributesFinderFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -78,7 +78,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DriveAttributesFinderFeature(session, fileid)).find(test); assertNotNull(attributes); assertEquals(0L, attributes.getSize()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -95,7 +95,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session)).find(test); assertNotNull(attributes); assertEquals(0L, attributes.getSize()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -113,7 +113,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session)).find(test); assertEquals(fileId, attributes.getFileId()); assertEquals(fileId, cryptomator.encrypt(session, test, true).attributes().getFileId()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -135,7 +135,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { assertTrue(cache.isCached(vault)); assertEquals(test, cache.get(vault).get(0)); assertEquals(0L, cache.get(vault).get(0).attributes().getSize()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -157,7 +157,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { assertTrue(cache.isCached(vault)); assertEquals(test, cache.get(vault).get(0)); assertEquals(0L, cache.get(vault).get(0).attributes().getSize()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -183,6 +183,6 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { cache.put(vault, list); final PathAttributes attributes = new CachingAttributesFinderFeature(session, cache, cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session))).find(test); assertEquals(fileId, attributes.getFileId()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveDirectoryFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveDirectoryFeatureTest.java index b16f19d348..664ddcd886 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveDirectoryFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveDirectoryFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -78,10 +78,10 @@ public class DriveDirectoryFeatureTest extends AbstractDriveTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DriveAttributesFinderFeature(session, fileid)).find(test); assertEquals(versionId, attributes.getFileId()); assertEquals(attributes, cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new CryptoListService(session, new DriveListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()) .toStream().filter(f -> !f.attributes().isDuplicate()).collect(Collectors.toList()).isEmpty()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -100,6 +100,6 @@ public class DriveDirectoryFeatureTest extends AbstractDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DriveAttributesFinderFeature(session, fileid)).find(test); assertEquals(versionId, attributes.getFileId()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveListServiceTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveListServiceTest.java index 8737f0f251..11253b715b 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveListServiceTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveListServiceTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -70,12 +70,12 @@ public class DriveListServiceTest extends AbstractDriveTest { cryptomator.getFeature(session, Write.class, new DriveWriteFeature(session, fileid)), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotNull(testFile.attributes().getFileId()); assertEquals(testFile, new CryptoListService(session, new DriveDefaultListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()).get(0)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Collections.singletonList(testFile), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Collections.singletonList(testFile), LoginCallback.noop, new Delete.DisabledCallback()); final Path testDir = cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( cryptomator.getFeature(session, Write.class, new DriveWriteFeature(session, fileid)), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new CryptoListService(session, new DriveDefaultListService(session, fileid), cryptomator).list(testDir, new DisabledListProgressListener()).isEmpty()); final AttributedList list = new CryptoListService(session, new DriveDefaultListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()); assertNotNull(list.find(new SimplePathPredicate(testDir))); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(testDir, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(testDir, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveMoveFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveMoveFeatureTest.java index 64e2613d97..353903b640 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveMoveFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveMoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.features.AttributesFinder; @@ -86,6 +86,6 @@ public class DriveMoveFeatureTest extends AbstractDriveTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList( - fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveTouchFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveTouchFeatureTest.java index 65276bcdda..7ff3e2fe05 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveTouchFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveTouchFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -71,7 +71,7 @@ public class DriveTouchFeatureTest extends AbstractDriveTest { final Path found = new CryptoListService(session, new DriveListService(session, fileid), cryptomator).list(test.getParent(), new DisabledListProgressListener()).find(new SimplePathPredicate(test)); final String fileId = found.attributes().getFileId(); assertNotNull(fileId); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -89,7 +89,7 @@ public class DriveTouchFeatureTest extends AbstractDriveTest { final Path found = new CryptoListService(session, new DriveListService(session, fileid), cryptomator).list(test.getParent(), new DisabledListProgressListener()).find(new SimplePathPredicate(test)); final String fileId = found.attributes().getFileId(); assertNotNull(fileId); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -107,6 +107,6 @@ public class DriveTouchFeatureTest extends AbstractDriveTest { final Path found = new CryptoListService(session, new DriveListService(session, fileid), cryptomator).list(test.getParent(), new DisabledListProgressListener()).find(new SimplePathPredicate(test)); final String fileId = found.attributes().getFileId(); assertNotNull(fileId); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveWriteFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveWriteFeatureTest.java index fe659936af..3969d2642b 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveWriteFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveWriteFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.Cache; import ch.cyberduck.core.CachingAttributesFinderFeature; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -105,7 +105,7 @@ public class DriveWriteFeatureTest extends AbstractDriveTest { final InputStream in = new CryptoReadFeature(session, new DriveReadFeature(session, fileid), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -161,6 +161,6 @@ public class DriveWriteFeatureTest extends AbstractDriveTest { final InputStream in = new CryptoReadFeature(session, new DriveReadFeature(session, fileid), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 9563220a54..97742ab47e 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -93,14 +93,14 @@ public class MoveWorkerTest extends AbstractDriveTest { new CryptoBulkFeature<>(session, new DisabledBulkFeature(), cryptomator).pre(Transfer.Type.upload, Collections.singletonMap(new TransferItem(source), status), ConnectionCallback.noop); new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(new ByteArrayInputStream(content), new CryptoWriteFeature<>(session, new DriveWriteFeature(session, fileid), cryptomator).write(source, status.setLength(content.length), ConnectionCallback.noop)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new DriveReadFeature(session, fileid), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(target, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(target, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -119,11 +119,11 @@ public class MoveWorkerTest extends AbstractDriveTest { cryptomator.getFeature(session, Write.class, new DriveWriteFeature(session, fileid)), new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final Path target = new Path(targetFolder, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -143,11 +143,11 @@ public class MoveWorkerTest extends AbstractDriveTest { cryptomator.getFeature(session, Write.class, new DriveWriteFeature(session, fileid)), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -170,20 +170,20 @@ public class MoveWorkerTest extends AbstractDriveTest { final String filenameRenamed = new AlphanumericRandomStringService().random(); new MoveWorker(Collections.singletonMap( new Path(folder, filename, EnumSet.of(Path.Type.file)), - new Path(folder, filenameRenamed, EnumSet.of(Path.Type.file))), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new Path(folder, filenameRenamed, EnumSet.of(Path.Type.file))), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find( new Path(folder, filename, EnumSet.of(Path.Type.file)))); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find( new Path(folder, filenameRenamed, EnumSet.of(Path.Type.file)))); // rename folder final Path folderRenamed = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(folder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(folderRenamed)); assertEquals(1, new CryptoListService(session, new DriveListService(session, fileid), cryptomator).list(folderRenamed, new DisabledListProgressListener()).size()); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, filenameRenamed, EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -203,10 +203,10 @@ public class MoveWorkerTest extends AbstractDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); // move file into vault final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -228,11 +228,11 @@ public class MoveWorkerTest extends AbstractDriveTest { // move directory into vault final Path encryptedFolder = new Path(vault, clearFolder.getName(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, clearFile.getName(), EnumSet.of(Path.Type.file)); - final CopyWorker worker = new CopyWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final CopyWorker worker = new CopyWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -255,11 +255,11 @@ public class MoveWorkerTest extends AbstractDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move file outside vault final Path fileRenamed = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, clearFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, clearFolder), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -281,13 +281,13 @@ public class MoveWorkerTest extends AbstractDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move directory outside vault final Path directoryRenamed = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session, registry), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(new DefaultFindFeature(session).find(directoryRenamed)); final Path fileRenamed = new Path(directoryRenamed, filename, EnumSet.of(Path.Type.file)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, directoryRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DriveDeleteFeature(session, fileid)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, directoryRenamed), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DefaultAttributesFinderFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DefaultAttributesFinderFeatureTest.java index a0c827d79d..7b82ad1ff3 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DefaultAttributesFinderFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DefaultAttributesFinderFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.AttributesFinder; @@ -86,6 +86,6 @@ public class DefaultAttributesFinderFeatureTest extends AbstractDriveTest { assertEquals(newFileid, f.find(file.withAttributes(new DefaultPathAttributes(file.attributes()).setFileId(newFileid))).getFileId()); assertNotEquals(initialFileid, f.find(file.withAttributes(new DefaultPathAttributes(file.attributes()).setFileId(newFileid))).getFileId()); assertEquals(out.getStatus().getId(), f.find(file).getFileId()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveAttributesFinderFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveAttributesFinderFeatureTest.java index 8e851c4aa5..9bb5e687b6 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveAttributesFinderFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveAttributesFinderFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -80,7 +80,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), test, new TransferStatus()); final DriveAttributesFinderFeature f = new DriveAttributesFinderFeature(session, new DriveFileIdProvider(session)); assertNotEquals(PathAttributes.EMPTY, f.find(test)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -93,7 +93,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { assertEquals(0L, attributes.getSize()); assertNotNull(attributes.getFileId()); assertNull(attributes.getVersionId()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -109,7 +109,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { final AttributedList listBeforeDelete = new DriveListService(session, fileid).list(folder, new DisabledListProgressListener()); assertTrue(listBeforeDelete.contains(version1)); assertFalse(listBeforeDelete.find(new DefaultPathPredicate(version1)).attributes().isHidden()); - new DriveTrashFeature(session, fileid).delete(Collections.singletonList(new Path(version1)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveTrashFeature(session, fileid).delete(Collections.singletonList(new Path(version1)), LoginCallback.noop, new Delete.DisabledCallback()); final AttributedList listAfterDelete = new DriveListService(session, fileid).list(folder, new DisabledListProgressListener()); assertTrue(listAfterDelete.contains(version1)); assertTrue(listAfterDelete.find(new DefaultPathPredicate(version1)).attributes().isTrashed()); @@ -119,7 +119,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { final AttributedList listAfterReupload = new DriveListService(session, fileid).list(folder, new DisabledListProgressListener()); assertTrue(listAfterReupload.contains(version2)); assertFalse(listAfterReupload.find(new DefaultPathPredicate(version2)).attributes().isHidden()); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(version1, version2, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(version1, version2, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -133,7 +133,7 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { assertNotEquals(-1L, attributes.getCreationDate()); assertNotEquals(-1L, attributes.getModificationDate()); assertNotNull(attributes.getFileId()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -179,6 +179,6 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { fileid.cache(test, String.valueOf(RandomUtils.nextLong())); final DriveAttributesFinderFeature f = new DriveAttributesFinderFeature(session, fileid); assertEquals(latestnodeid, f.find(new Path(test).withAttributes(PathAttributes.EMPTY)).getFileId()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveBatchDeleteFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveBatchDeleteFeatureTest.java index 116c10a7ff..0868c53247 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveBatchDeleteFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveBatchDeleteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -42,7 +42,7 @@ public class DriveBatchDeleteFeatureTest extends AbstractDriveTest { @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(DriveHomeFinderService.MYDRIVE_FOLDER, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - new DriveBatchDeleteFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveBatchDeleteFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -53,7 +53,7 @@ public class DriveBatchDeleteFeatureTest extends AbstractDriveTest { assertTrue(new DriveFindFeature(session, fileid).find(directory, new DisabledListProgressListener())); final Path file = new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(file, new DisabledListProgressListener())); - new DriveBatchDeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveBatchDeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new DriveFindFeature(session, fileid).find(directory, new DisabledListProgressListener()))); assertFalse((new DriveFindFeature(session, fileid).find(file, new DisabledListProgressListener()))); } @@ -66,11 +66,11 @@ public class DriveBatchDeleteFeatureTest extends AbstractDriveTest { final Path file2 = new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(file1)); assertTrue(new DriveFindFeature(session, fileid).find(file2)); - new DriveBatchDeleteFeature(session, fileid).delete(Arrays.asList(file1, file2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveBatchDeleteFeature(session, fileid).delete(Arrays.asList(file1, file2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new DriveFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); assertFalse((new DriveFindFeature(session, fileid).find(file2, new DisabledListProgressListener()))); assertTrue(new DriveFindFeature(session, fileid).find(folder, new DisabledListProgressListener())); - new DriveBatchDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveBatchDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new DriveFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveBatchTrashFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveBatchTrashFeatureTest.java index 54a3b430d7..9f7f1452fe 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveBatchTrashFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveBatchTrashFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -42,7 +42,7 @@ public class DriveBatchTrashFeatureTest extends AbstractDriveTest { @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(DriveHomeFinderService.MYDRIVE_FOLDER, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - new DriveBatchTrashFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveBatchTrashFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveCopyFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveCopyFeatureTest.java index c8081f33d1..4c6d1a6307 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveCopyFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveCopyFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Find; @@ -51,7 +51,7 @@ public class DriveCopyFeatureTest extends AbstractDriveTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -69,6 +69,6 @@ public class DriveCopyFeatureTest extends AbstractDriveTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDefaultListServiceTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDefaultListServiceTest.java index 7a082ca8c4..4a38b631a0 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDefaultListServiceTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDefaultListServiceTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -168,7 +168,7 @@ public class DriveDefaultListServiceTest extends AbstractDriveTest { new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid), folder, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(file)); assertTrue(new DefaultFindFeature(session).find(folder)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -188,7 +188,7 @@ public class DriveDefaultListServiceTest extends AbstractDriveTest { session.getClient().files().update(fileid, body).execute(); new DriveDirectoryFeature(session, provider).mkdir(new DriveWriteFeature(session, provider), folder, new TransferStatus()); assertEquals(2, new DriveDefaultListService(session, provider).list(parent, new DisabledListProgressListener()).size()); - new DriveDeleteFeature(session, provider).delete(Collections.singletonList(parent), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, provider).delete(Collections.singletonList(parent), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -205,6 +205,6 @@ public class DriveDefaultListServiceTest extends AbstractDriveTest { } }).isEmpty()); assertTrue(callback.get()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDeleteFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDeleteFeatureTest.java index a44b36ed16..8ea6235545 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDeleteFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDeleteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -42,7 +42,7 @@ public class DriveDeleteFeatureTest extends AbstractDriveTest { @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(DriveHomeFinderService.MYDRIVE_FOLDER, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - new DriveDeleteFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -51,7 +51,7 @@ public class DriveDeleteFeatureTest extends AbstractDriveTest { final Path directory = new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid), new Path(DriveHomeFinderService.MYDRIVE_FOLDER, new AlphanumericRandomStringService().random(), EnumSet.of(AbstractPath.Type.directory)), new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(directory, new DisabledListProgressListener())); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new DriveFindFeature(session, fileid).find(directory, new DisabledListProgressListener()))); } @@ -63,11 +63,11 @@ public class DriveDeleteFeatureTest extends AbstractDriveTest { final Path file2 = new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(file1)); assertTrue(new DriveFindFeature(session, fileid).find(file2)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file1, file2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file1, file2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new DriveFindFeature(session, fileid).find(file1, new DisabledListProgressListener()))); assertFalse((new DriveFindFeature(session, fileid).find(file2, new DisabledListProgressListener()))); assertTrue(new DriveFindFeature(session, fileid).find(folder, new DisabledListProgressListener())); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new DriveFindFeature(session, fileid).find(folder, new DisabledListProgressListener()))); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDirectoryFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDirectoryFeatureTest.java index 39cfd8d41f..f9821316c9 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDirectoryFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveDirectoryFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.exception.ConflictException; @@ -48,7 +48,7 @@ public class DriveDirectoryFeatureTest extends AbstractDriveTest { assertNotNull(test.attributes().getFileId()); assertTrue(new DefaultFindFeature(session).find(test)); assertThrows(ConflictException.class, () -> new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid), test, new TransferStatus())); - new DriveTrashFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveTrashFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertNull(test.attributes().getFileId()); // Trashed assertFalse(new DriveFindFeature(session, fileid).find(test)); @@ -59,6 +59,6 @@ public class DriveDirectoryFeatureTest extends AbstractDriveTest { assertEquals(id, trashed.attributes().getFileId()); assertTrue(new DefaultFindFeature(session).find(trashed)); assertTrue(new DriveFindFeature(session, fileid).find(trashed)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveFileIdProviderTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveFileIdProviderTest.java index 2825adc83b..060f8b2cac 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveFileIdProviderTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveFileIdProviderTest.java @@ -16,9 +16,9 @@ package ch.cyberduck.core.googledrive; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Directory; @@ -54,7 +54,7 @@ public class DriveFileIdProviderTest extends AbstractDriveTest { final DriveFileIdProvider fileid = new DriveFileIdProvider(session); new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), test, new TransferStatus()); assertNotNull(fileid.getFileId(test)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -63,7 +63,7 @@ public class DriveFileIdProviderTest extends AbstractDriveTest { final DriveFileIdProvider fileid = new DriveFileIdProvider(session); new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), test, new TransferStatus()); assertNotNull(fileid.getFileId(test)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -72,7 +72,7 @@ public class DriveFileIdProviderTest extends AbstractDriveTest { final DriveFileIdProvider driveFileIdProvider = new DriveFileIdProvider(session); new DriveTouchFeature(session, driveFileIdProvider).touch(new DriveWriteFeature(session, driveFileIdProvider), test, new TransferStatus()); assertNotNull(driveFileIdProvider.getFileId(test)); - new DriveDeleteFeature(session, driveFileIdProvider).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, driveFileIdProvider).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -81,7 +81,7 @@ public class DriveFileIdProviderTest extends AbstractDriveTest { final DriveFileIdProvider fileid = new DriveFileIdProvider(session); new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), test, new TransferStatus()); assertNotNull(fileid.getFileId(test)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -90,7 +90,7 @@ public class DriveFileIdProviderTest extends AbstractDriveTest { final DriveFileIdProvider fileid = new DriveFileIdProvider(session); new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), test, new TransferStatus()); assertNotNull(fileid.getFileId(test)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveFindFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveFindFeatureTest.java index 399cda7ee6..4725cc7dab 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveFindFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveFindFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.features.Delete; @@ -51,7 +51,7 @@ public class DriveFindFeatureTest extends AbstractDriveTest { new DriveWriteFeature(session, fileid), new Path(DriveHomeFinderService.MYDRIVE_FOLDER, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(folder)); assertFalse(new DriveFindFeature(session, fileid).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -61,7 +61,7 @@ public class DriveFindFeatureTest extends AbstractDriveTest { new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), file, new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(file)); assertFalse(new DriveFindFeature(session, fileid).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -73,7 +73,7 @@ public class DriveFindFeatureTest extends AbstractDriveTest { new DriveWriteFeature(session, fileid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final String id = file.attributes().getFileId(); assertTrue(new DriveFindFeature(session, fileid).find(file)); - new DriveTrashFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveTrashFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(file)); assertFalse(new DriveFindFeature(session, fileid).find(file)); // When searching with version "2", find trashed file @@ -87,6 +87,6 @@ public class DriveFindFeatureTest extends AbstractDriveTest { assertTrue(new DefaultFindFeature(session).find(version2)); assertTrue(new DriveFindFeature(session, fileid).find(version2)); assertEquals(version2.attributes(), new DriveAttributesFinderFeature(session, fileid).find(version2)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(version2, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(version2, folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMetadataFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMetadataFeatureTest.java index 2cd06d59a2..62aa140c05 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMetadataFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMetadataFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.googledrive; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -53,7 +53,7 @@ public class DriveMetadataFeatureTest extends AbstractDriveTest { feature.setMetadata(test, status.setMetadata(Collections.emptyMap())); assertFalse(status.getResponse().getMetadata().containsKey("test")); assertFalse(feature.getMetadata(test).containsKey("test")); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -73,6 +73,6 @@ public class DriveMetadataFeatureTest extends AbstractDriveTest { catch(NotfoundException e) { assertNull(test.attributes().getFileId()); } - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMoveFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMoveFeatureTest.java index 860ba653d7..5369130d4a 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMoveFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMoveFeatureTest.java @@ -20,7 +20,7 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -73,7 +73,7 @@ public class DriveMoveFeatureTest extends AbstractDriveTest { final PathAttributes targetAttr = new DriveAttributesFinderFeature(session, fileid).find(target); assertEquals(target.attributes(), targetAttr); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, test.attributes(), targetAttr)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(target, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(target, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -92,7 +92,7 @@ public class DriveMoveFeatureTest extends AbstractDriveTest { assertTrue(files.get(new Path(test).withAttributes(new DefaultPathAttributes().setFileId(firstVersion))).attributes().isTrashed()); assertFalse(files.get(target).attributes().isHidden()); assertTrue(find.find(target)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -108,6 +108,6 @@ public class DriveMoveFeatureTest extends AbstractDriveTest { assertFalse(find.find(sourceDirectory)); assertTrue(find.find(targetDirectory)); assertTrue(find.find(targetFile)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(targetFile, targetDirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(targetFile, targetDirectory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveReadFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveReadFeatureTest.java index ded5953a8e..0d51449ecd 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveReadFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveReadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.SimplePathPredicate; @@ -92,7 +92,7 @@ public class DriveReadFeatureTest extends AbstractDriveTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -103,7 +103,7 @@ public class DriveReadFeatureTest extends AbstractDriveTest { final CountingInputStream in = new CountingInputStream(new DriveReadFeature(session, fileid).read(file, new TransferStatus(), ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,7 +115,7 @@ public class DriveReadFeatureTest extends AbstractDriveTest { final CountingInputStream in = new CountingInputStream(new DriveReadFeature(session, fileid).read(file, new TransferStatus(), ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -127,7 +127,7 @@ public class DriveReadFeatureTest extends AbstractDriveTest { final CountingInputStream in = new CountingInputStream(new DriveReadFeature(session, fileid).read(file, new TransferStatus(), ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -147,7 +147,7 @@ public class DriveReadFeatureTest extends AbstractDriveTest { final CountingInputStream in = new CountingInputStream(new DriveReadFeature(session, fileid).read(test, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(test, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(test, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -178,8 +178,8 @@ public class DriveReadFeatureTest extends AbstractDriveTest { } assertEquals(2, new DriveVersioningFeature(session, fileid).list(test, new DisabledListProgressListener()).size()); // Permanently delete revision - //new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(versioned), new DisabledLoginCallback(), new Delete.DisabledCallback()); + //new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(versioned), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new DriveFindFeature(session, fileid).find(test)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(test, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(test, directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveSearchFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveSearchFeatureTest.java index e44e0fd42f..5d95784ab7 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveSearchFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveSearchFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -52,7 +52,7 @@ public class DriveSearchFeatureTest extends AbstractDriveTest { assertTrue(feature.search(workdir, new SearchFilter(StringUtils.substring(name, 0, name.length() - 2)), new DisabledListProgressListener()).contains(file)); final Path subdir = new Path(workdir, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); assertFalse(feature.search(subdir, new SearchFilter(name), new DisabledListProgressListener()).contains(file)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -69,7 +69,7 @@ public class DriveSearchFeatureTest extends AbstractDriveTest { assertEquals(workdir, result.get(result.indexOf(file)).getParent()); final Path subdir = new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid), new Path(workdir, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertFalse(feature.search(subdir, new SearchFilter(name), new DisabledListProgressListener()).contains(file)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, subdir, workdir), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, subdir, workdir), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -80,6 +80,6 @@ public class DriveSearchFeatureTest extends AbstractDriveTest { final Path file = new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), new Path(workdir, name, EnumSet.of(Path.Type.file)), new TransferStatus()); final DriveSearchFeature feature = new DriveSearchFeature(session, fileid); assertTrue(feature.search(DriveHomeFinderService.MYDRIVE_FOLDER, new SearchFilter(name), new DisabledListProgressListener()).contains(file)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, workdir), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(file, workdir), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveSharingUrlProviderTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveSharingUrlProviderTest.java index 875e4d961a..5e7174a9f5 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveSharingUrlProviderTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveSharingUrlProviderTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.googledrive; */ import ch.cyberduck.core.DescriptiveUrl; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Share; @@ -49,6 +49,6 @@ public class DriveSharingUrlProviderTest extends AbstractDriveTest { final DescriptiveUrl url = provider.toDownloadUrl(test, Share.Sharee.world, null, new DisabledPasswordCallback()); assertNotEquals(DescriptiveUrl.EMPTY, url); assertNotNull(url.getUrl()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTimestampFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTimestampFeatureTest.java index 26927f2dac..411bcc5023 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTimestampFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTimestampFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.googledrive; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -49,7 +49,7 @@ public class DriveTimestampFeatureTest extends AbstractDriveTest { assertEquals(modified, attr.getModificationDate()); assertEquals(attr, status.getResponse()); assertEquals(Collections.singletonMap("test", "t"), new DriveMetadataFeature(session, fileid).getMetadata(test)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -62,6 +62,6 @@ public class DriveTimestampFeatureTest extends AbstractDriveTest { new DriveTimestampFeature(session, fileid).setTimestamp(test, modified); assertEquals(modified, new DefaultAttributesFinderFeature(session).find(test).getModificationDate()); assertEquals(modified, new DriveAttributesFinderFeature(session, fileid).find(test).getModificationDate()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTouchFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTouchFeatureTest.java index ba8f6994f7..566d2981d6 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTouchFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTouchFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.googledrive; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -48,7 +48,7 @@ public class DriveTouchFeatureTest extends AbstractDriveTest { assertEquals(test.attributes().getFileId(), new DriveAttributesFinderFeature(session, fileid).find(test).getFileId()); assertThrows(ConflictException.class, () -> new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), test, new TransferStatus())); assertThrows(ConflictException.class, () -> new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid), test, new TransferStatus())); - new DriveTrashFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveTrashFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertNull(test.attributes().getFileId()); // Trashed assertFalse(new DriveFindFeature(session, fileid).find(test)); @@ -56,6 +56,6 @@ public class DriveTouchFeatureTest extends AbstractDriveTest { test.attributes().setFileId(id); assertTrue(new DriveFindFeature(session, fileid).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTrashFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTrashFeatureTest.java index 15fbe4c3f8..11d8476948 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTrashFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveTrashFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -44,7 +44,7 @@ public class DriveTrashFeatureTest extends AbstractDriveTest { @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(DriveHomeFinderService.MYDRIVE_FOLDER, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - new DriveTrashFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveTrashFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -56,7 +56,7 @@ public class DriveTrashFeatureTest extends AbstractDriveTest { final Path file = new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), file, new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(file, new DisabledListProgressListener())); - new DriveTrashFeature(session, fileid).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveTrashFeature(session, fileid).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse((new DriveFindFeature(session, fileid).find(directory, new DisabledListProgressListener()))); } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveUploadFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveUploadFeatureTest.java index 06754db553..9a9942379f 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveUploadFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveUploadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.googledrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -77,7 +77,7 @@ public class DriveUploadFeatureTest extends AbstractDriveTest { System.arraycopy(content, 1, reference, 0, content.length - 1); assertArrayEquals(reference, buffer); } - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveUrlProviderTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveUrlProviderTest.java index 29121f47f7..45484795c9 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveUrlProviderTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveUrlProviderTest.java @@ -15,7 +15,7 @@ package ch.cyberduck.core.googledrive; * GNU General Public License for more details. */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -42,6 +42,6 @@ public class DriveUrlProviderTest extends AbstractDriveTest { assertTrue(provider.toUrl(test).isEmpty()); new DriveTouchFeature(session, new DriveFileIdProvider(session)).touch(new DriveWriteFeature(session, new DriveFileIdProvider(session)), test, new TransferStatus()); // assertFalse(provider.toDownloadUrl(test).isEmpty()); - new DriveDeleteFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, new DriveFileIdProvider(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveVersioningFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveVersioningFeatureTest.java index f2621781bb..df4a9e065c 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveVersioningFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveVersioningFeatureTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -95,8 +95,8 @@ public class DriveVersioningFeatureTest extends AbstractDriveTest { } new DriveDeleteFeature(session, fileid).delete(versions.toList(), new DisabledPasswordCallback(), new Delete.DisabledCallback()); for(Path version : new DriveListService(session, fileid).list(room, new DisabledListProgressListener())) { - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(version), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(version), LoginCallback.noop, new Delete.DisabledCallback()); } - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveWriteFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveWriteFeatureTest.java index 971a7a4344..6dce076d1d 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveWriteFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveWriteFeatureTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.CacheReference; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -103,7 +103,7 @@ public class DriveWriteFeatureTest extends AbstractDriveTest { assertEquals(status.getModified().longValue(), new DriveAttributesFinderFeature(session, idProvider).toAttributes(out.getStatus()).getModificationDate()); assertEquals(new DriveAttributesFinderFeature(session, idProvider).toAttributes(out.getStatus()), attributes); } - new DriveDeleteFeature(session, idProvider).delete(Arrays.asList(test, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, idProvider).delete(Arrays.asList(test, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -175,7 +175,7 @@ public class DriveWriteFeatureTest extends AbstractDriveTest { } }).attributes().isDuplicate()); } - new DriveDeleteFeature(session, idProvider).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, idProvider).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/googledrive/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java index 9cd06e51fb..ecb139bbf0 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -55,7 +55,7 @@ public class DeleteWorkerTest extends AbstractDriveTest { final Path file = new DriveTouchFeature(session, fileid).touch( new DriveWriteFeature(session, fileid), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(file)); - final DeleteWorker worker = new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(folder), ProgressListener.noop, true); + final DeleteWorker worker = new DeleteWorker(LoginCallback.noop, Collections.singletonList(folder), ProgressListener.noop, true); int hashCode = worker.hashCode(); worker.run(session); assertEquals(hashCode, worker.hashCode()); diff --git a/googledrive/src/test/java/ch/cyberduck/core/worker/DirectoryWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/worker/DirectoryWorkerTest.java index f6bbdd37a6..303002bd59 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/worker/DirectoryWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/worker/DirectoryWorkerTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.worker; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.googledrive.AbstractDriveTest; @@ -45,6 +45,6 @@ public class DirectoryWorkerTest extends AbstractDriveTest { int hashCode = worker.hashCode(); worker.run(session); assertEquals(hashCode, worker.hashCode()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/worker/ListWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/worker/ListWorkerTest.java index 6a6e19c178..6ed7db0c57 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/worker/ListWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/worker/ListWorkerTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.CachingListProgressListener; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.features.Delete; @@ -91,6 +91,6 @@ public class ListWorkerTest extends AbstractDriveTest { assertEquals(0, l.filter(new DefaultBrowserFilter()).size()); assertEquals(2, l.size()); } - new DriveDeleteFeature(session, fileidProvider).delete(Collections.singletonList(parent), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileidProvider).delete(Collections.singletonList(parent), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java index e12a7cf0bd..e1d0810713 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.worker; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -58,16 +58,16 @@ public class MoveWorkerTest extends AbstractDriveTest { assertTrue(new DefaultFindFeature(session).find(file)); // rename file final Path fileRenamed = new Path(folder, "f1", EnumSet.of(Path.Type.file)); - new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(new DefaultFindFeature(session).find(file)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); // rename folder final Path folderRenamed = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(new DefaultFindFeature(session).find(folder)); assertTrue(new DefaultFindFeature(session).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(new DefaultFindFeature(session).find(fileRenamedInRenamedFolder)); - new DriveDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googledrive/src/test/java/ch/cyberduck/core/worker/TouchWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/worker/TouchWorkerTest.java index 5a93edf778..192cde07bb 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/worker/TouchWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/worker/TouchWorkerTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.worker; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.googledrive.AbstractDriveTest; @@ -45,6 +45,6 @@ public class TouchWorkerTest extends AbstractDriveTest { int hashCode = worker.hashCode(); worker.run(session); assertEquals(hashCode, worker.hashCode()); - new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DriveDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/cryptomator/GoogleStorageListServiceTest.java b/googlestorage/src/test/java/ch/cyberduck/core/cryptomator/GoogleStorageListServiceTest.java index 2761592831..52c94d201a 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/cryptomator/GoogleStorageListServiceTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/cryptomator/GoogleStorageListServiceTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.cryptomator.features.CryptoDirectoryV7Feature; @@ -74,6 +74,6 @@ public class GoogleStorageListServiceTest extends AbstractGoogleStorageTest { assertNotNull(new CryptoListService(session, new GoogleStorageObjectListService(session), cryptomator).list(directory1) .find(new SimplePathPredicate(directory2))); cryptomator.getFeature(session, Delete.class, new GoogleStorageDeleteFeature(session)) - .delete(Arrays.asList(test, directory1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + .delete(Arrays.asList(test, directory1, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/DefaultUploadFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/DefaultUploadFeatureTest.java index 7b5ad4e099..58de031acf 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/DefaultUploadFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/DefaultUploadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -61,12 +61,12 @@ public class DefaultUploadFeatureTest extends AbstractGoogleStorageTest { final TransferStatus status = new TransferStatus(); status.setLength(random.length); final StorageObject versionId = m.upload(new GoogleStorageWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new GoogleStorageFindFeature(session).find(test)); final PathAttributes attributes = new GoogleStorageListService(session).list(container, new DisabledListProgressListener()).find(new SimplePathPredicate(test)).attributes(); assertEquals(random.length, attributes.getSize()); assertEquals(String.valueOf(versionId.getGeneration()), attributes.getVersionId()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageAccessControlListFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageAccessControlListFeatureTest.java index f026bb7558..d66669589e 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageAccessControlListFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageAccessControlListFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -49,7 +49,7 @@ public class GoogleStorageAccessControlListFeatureTest extends AbstractGoogleSto f.setPermission(test, acl); assertTrue(f.getPermission(test).asList().contains(new Acl.UserAndRole(new Acl.GroupUser(Acl.GroupUser.EVERYONE), new Acl.Role(Acl.Role.READ)))); assertTrue(f.getPermission(test).asList().contains(new Acl.UserAndRole(new Acl.GroupUser(Acl.GroupUser.AUTHENTICATED), new Acl.Role(Acl.Role.READ)))); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -71,7 +71,7 @@ public class GoogleStorageAccessControlListFeatureTest extends AbstractGoogleSto final Path test = new GoogleStorageTouchFeature(session).touch(new GoogleStorageWriteFeature(session), new Path(new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertEquals(Acl.EMPTY, f.getPermission(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -81,7 +81,7 @@ public class GoogleStorageAccessControlListFeatureTest extends AbstractGoogleSto new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final GoogleStorageAccessControlListFeature f = new GoogleStorageAccessControlListFeature(session); assertNotNull(f.getPermission(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,7 +91,7 @@ public class GoogleStorageAccessControlListFeatureTest extends AbstractGoogleSto new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final GoogleStorageAccessControlListFeature f = new GoogleStorageAccessControlListFeature(session); assertNotNull(f.getPermission(placeholder)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageAttributesFinderFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageAttributesFinderFeatureTest.java index dbe6c29a2b..b26a52c05a 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageAttributesFinderFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageAttributesFinderFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -139,7 +139,7 @@ public class GoogleStorageAttributesFinderFeatureTest extends AbstractGoogleStor new AsciiRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotNull(new GoogleStorageAttributesFinderFeature(session).find(test)); assertNotNull(new GoogleStorageAttributesFinderFeature(session).find(new Path(container, prefix, EnumSet.of(Path.Type.directory)))); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); try { new GoogleStorageAttributesFinderFeature(session).find(test); fail(); diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageCopyFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageCopyFeatureTest.java index 5de7aa2aae..e1e36621de 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageCopyFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageCopyFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.StreamListener; @@ -49,11 +49,11 @@ public class GoogleStorageCopyFeatureTest extends AbstractGoogleStorageTest { assertTrue(feature.isSupported(test, Optional.of(copy))); feature.copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new GoogleStorageFindFeature(session).find(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new GoogleStorageFindFeature(session).find(copy)); assertEquals("set", new GoogleStorageMetadataFeature(session).getMetadata(copy).get("cyberduck")); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -70,8 +70,8 @@ public class GoogleStorageCopyFeatureTest extends AbstractGoogleStorageTest { assertEquals("m", new GoogleStorageMetadataFeature(session).getMetadata(copy).get("cyberduck")); assertEquals(1, new GoogleStorageObjectListService(session).list(container, new DisabledListProgressListener()) .filter(new SearchFilter(copy.getName())).size()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new GoogleStorageFindFeature(session).find(copy)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageDeleteFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageDeleteFeatureTest.java index a9cc11ed73..e86d165a23 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageDeleteFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageDeleteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -46,7 +46,7 @@ public class GoogleStorageDeleteFeatureTest extends AbstractGoogleStorageTest { public void testDeleteNotFoundKey() throws Exception { final Path container = new Path("cyberduck-test-eu", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -54,7 +54,7 @@ public class GoogleStorageDeleteFeatureTest extends AbstractGoogleStorageTest { final Path container = new Path(new AsciiRandomStringService().random().toLowerCase(Locale.ROOT), EnumSet.of(Path.Type.volume, Path.Type.directory)); new GoogleStorageDirectoryFeature(session).mkdir(new GoogleStorageWriteFeature(session), container, new TransferStatus().setRegion("us")); assertTrue(new GoogleStorageFindFeature(session).find(container)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new GoogleStorageFindFeature(session).find(container)); } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageDirectoryFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageDirectoryFeatureTest.java index 1bafc6dc00..4be46556ee 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageDirectoryFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageDirectoryFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.ConflictException; @@ -49,7 +49,7 @@ public class GoogleStorageDirectoryFeatureTest extends AbstractGoogleStorageTest new GoogleStorageDirectoryFeature(session).mkdir(new GoogleStorageWriteFeature(session), test, new TransferStatus().setRegion("us")); assertTrue(new GoogleStorageFindFeature(session).find(test)); assertThrows(ConflictException.class, () -> new GoogleStorageDirectoryFeature(session).mkdir(new GoogleStorageWriteFeature(session), test, new TransferStatus())); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -65,7 +65,7 @@ public class GoogleStorageDirectoryFeatureTest extends AbstractGoogleStorageTest assertTrue(new GoogleStorageFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); // This will only cause a delete marker being added - new GoogleStorageDeleteFeature(session).delete(Arrays.asList(new Path(test).withAttributes(PathAttributes.EMPTY), parent), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Arrays.asList(new Path(test).withAttributes(PathAttributes.EMPTY), parent), LoginCallback.noop, new Delete.DisabledCallback()); // Specific version is still found assertTrue(new GoogleStorageFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); @@ -82,7 +82,7 @@ public class GoogleStorageDirectoryFeatureTest extends AbstractGoogleStorageTest String.format("%s %s", new AlphanumericRandomStringService().random(), new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new GoogleStorageFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -92,7 +92,7 @@ public class GoogleStorageDirectoryFeatureTest extends AbstractGoogleStorageTest assertTrue(test.getType().contains(Path.Type.placeholder)); assertTrue(new GoogleStorageFindFeature(session).find(test)); assertTrue(new GoogleStorageObjectListService(session).list(bucket, new DisabledListProgressListener()).contains(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new GoogleStorageObjectListService(session).list(bucket, new DisabledListProgressListener()).contains(test)); assertFalse(new DefaultFindFeature(session).find(test)); assertFalse(new GoogleStorageFindFeature(session).find(test)); @@ -106,7 +106,7 @@ public class GoogleStorageDirectoryFeatureTest extends AbstractGoogleStorageTest assertTrue(new GoogleStorageFindFeature(session).find(test)); assertTrue(new GoogleStorageObjectListService(session).list(bucket, new DisabledListProgressListener()).contains(test)); // Add delete marker - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(new Path(test).withAttributes(PathAttributes.EMPTY)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(new Path(test).withAttributes(PathAttributes.EMPTY)), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(new Path(test).withAttributes(PathAttributes.EMPTY))); assertFalse(new GoogleStorageFindFeature(session).find(new Path(test).withAttributes(PathAttributes.EMPTY))); assertTrue(new DefaultFindFeature(session).find(test)); diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageFindFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageFindFeatureTest.java index c61f97593f..1410aa83f5 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageFindFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageFindFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.CachingFindFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.features.Delete; @@ -54,7 +54,7 @@ public class GoogleStorageFindFeatureTest extends AbstractGoogleStorageTest { new GoogleStorageWriteFeature(session), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new GoogleStorageFindFeature(session).find(folder)); assertFalse(new GoogleStorageFindFeature(session).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -64,7 +64,7 @@ public class GoogleStorageFindFeatureTest extends AbstractGoogleStorageTest { new GoogleStorageTouchFeature(session).touch(new GoogleStorageWriteFeature(session), file, new TransferStatus()); assertTrue(new GoogleStorageFindFeature(session).find(file)); assertFalse(new GoogleStorageFindFeature(session).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,7 +91,7 @@ public class GoogleStorageFindFeatureTest extends AbstractGoogleStorageTest { assertTrue(new GoogleStorageFindFeature(session).find(new Path(container, prefix, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); assertTrue(new GoogleStorageObjectListService(session).list(new Path(container, prefix, EnumSet.of(Path.Type.directory)), new DisabledListProgressListener()).contains(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new GoogleStorageFindFeature(session).find(test)); assertFalse(new GoogleStorageFindFeature(session).find(new Path(container, prefix, EnumSet.of(Path.Type.directory)))); final PathCache cache = new PathCache(1); diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageLifecycleFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageLifecycleFeatureTest.java index 7073493846..6f0985d9e3 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageLifecycleFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageLifecycleFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.googlestorage; */ import ch.cyberduck.core.AsciiRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.lifecycle.LifecycleConfiguration; @@ -49,7 +49,7 @@ public class GoogleStorageLifecycleFeatureTest extends AbstractGoogleStorageTest assertEquals(2, read.getExpiration(), 0L); feature.setConfiguration(test, LifecycleConfiguration.empty()); assertEquals(LifecycleConfiguration.empty(), feature.getConfiguration(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageMetadataFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageMetadataFeatureTest.java index 99572279a1..6688c0ec6c 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageMetadataFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageMetadataFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.googlestorage; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -59,7 +59,7 @@ public class GoogleStorageMetadataFeatureTest extends AbstractGoogleStorageTest assertEquals("v", get.get("k")); feature.setMetadata(test, status.setMetadata(Collections.emptyMap())); assertTrue(feature.getMetadata(test).isEmpty()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -77,6 +77,6 @@ public class GoogleStorageMetadataFeatureTest extends AbstractGoogleStorageTest assertTrue(metadata.containsKey("Test")); assertEquals(v, metadata.get("Test")); assertEquals("NEARLINE", storage.getClass(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageMoveFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageMoveFeatureTest.java index 887cfd7067..2a4453f31d 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageMoveFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageMoveFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -61,7 +61,7 @@ public class GoogleStorageMoveFeatureTest extends AbstractGoogleStorageTest { final Map metadata = new GoogleStorageMetadataFeature(session).getMetadata(renamed); assertFalse(metadata.isEmpty()); assertEquals("set", metadata.get("cyberduck")); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -74,7 +74,7 @@ public class GoogleStorageMoveFeatureTest extends AbstractGoogleStorageTest { new GoogleStorageMoveFeature(session).move(test, renamed, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new GoogleStorageFindFeature(session).find(test)); assertTrue(new GoogleStorageFindFeature(session).find(renamed)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -98,6 +98,6 @@ public class GoogleStorageMoveFeatureTest extends AbstractGoogleStorageTest { new GoogleStorageMoveFeature(session).move(test, renamed, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new GoogleStorageFindFeature(session).find(test)); assertTrue(new GoogleStorageFindFeature(session).find(renamed)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageObjectListServiceTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageObjectListServiceTest.java index 55e8500063..267f94d09c 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageObjectListServiceTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageObjectListServiceTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.IndexedListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.VersioningConfiguration; import ch.cyberduck.core.features.Delete; @@ -85,9 +85,9 @@ public class GoogleStorageObjectListServiceTest extends AbstractGoogleStorageTes }); for(int i = 0; i < list.size(); i++) { assertEquals(files.get(i), list.get(i).getName()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(list.get(i)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(list.get(i)), LoginCallback.noop, new Delete.DisabledCallback()); } - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -97,7 +97,7 @@ public class GoogleStorageObjectListServiceTest extends AbstractGoogleStorageTes final Path placeholder = new GoogleStorageTouchFeature(session).touch( new GoogleStorageWriteFeature(session), new Path(container, String.format("^<%%%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new GoogleStorageObjectListService(session).list(container, new DisabledListProgressListener()).contains(placeholder)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -107,7 +107,7 @@ public class GoogleStorageObjectListServiceTest extends AbstractGoogleStorageTes final Path placeholder = new GoogleStorageDirectoryFeature(session).mkdir( new GoogleStorageWriteFeature(session), new Path(container, String.format("%s +", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new GoogleStorageObjectListService(session).list(container, new DisabledListProgressListener()).contains(placeholder)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -118,7 +118,7 @@ public class GoogleStorageObjectListServiceTest extends AbstractGoogleStorageTes new GoogleStorageWriteFeature(session), new Path(container, String.format("%s +", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new GoogleStorageObjectListService(session).list(container, new DisabledListProgressListener(), String.valueOf(Path.DELIMITER), HostPreferencesFactory.get(session.getHost()).getInteger("googlestorage.listing.chunksize"), VersioningConfiguration.empty()).contains(placeholder)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -128,7 +128,7 @@ public class GoogleStorageObjectListServiceTest extends AbstractGoogleStorageTes final Path placeholder = new GoogleStorageTouchFeature(session).touch( new GoogleStorageWriteFeature(session), new Path(container, String.format("test-\u001F-%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new GoogleStorageObjectListService(session).list(container, new DisabledListProgressListener()).contains(placeholder)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -138,7 +138,7 @@ public class GoogleStorageObjectListServiceTest extends AbstractGoogleStorageTes final Path placeholder = new GoogleStorageTouchFeature(session).touch( new GoogleStorageWriteFeature(session), new Path(container, String.format("test+%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new GoogleStorageObjectListService(session).list(container, new DisabledListProgressListener()).contains(placeholder)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -151,7 +151,7 @@ public class GoogleStorageObjectListServiceTest extends AbstractGoogleStorageTes new GoogleStorageWriteFeature(session), new Path(directory, String.format("test+%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new GoogleStorageObjectListService(session).list(directory, new DisabledListProgressListener()).contains(placeholder)); assertTrue(new GoogleStorageObjectListService(session).list(placeholder, new DisabledListProgressListener()).isEmpty()); - new GoogleStorageDeleteFeature(session).delete(Arrays.asList(placeholder, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Arrays.asList(placeholder, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -160,6 +160,6 @@ public class GoogleStorageObjectListServiceTest extends AbstractGoogleStorageTes final Path placeholder = new GoogleStorageDirectoryFeature(session).mkdir( new GoogleStorageWriteFeature(session), new Path(container, ".", EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new GoogleStorageObjectListService(session).list(container, new DisabledListProgressListener()).contains(placeholder)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageReadFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageReadFeatureTest.java index 2d02432ebf..13818f5fb0 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageReadFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageReadFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -82,7 +82,7 @@ public class GoogleStorageReadFeatureTest extends AbstractGoogleStorageTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -102,7 +102,7 @@ public class GoogleStorageReadFeatureTest extends AbstractGoogleStorageTest { assertEquals(content.length, count.getRecv()); assertEquals(content.length, status.getLength()); in.close(); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -118,7 +118,7 @@ public class GoogleStorageReadFeatureTest extends AbstractGoogleStorageTest { final CountingInputStream in = new CountingInputStream(new GoogleStorageReadFeature(session).read(file, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -135,7 +135,7 @@ public class GoogleStorageReadFeatureTest extends AbstractGoogleStorageTest { final CountingInputStream in = new CountingInputStream(new GoogleStorageReadFeature(session).read(file, new TransferStatus(), ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -153,7 +153,7 @@ public class GoogleStorageReadFeatureTest extends AbstractGoogleStorageTest { final CountingInputStream in = new CountingInputStream(new GoogleStorageReadFeature(session).read(file, new TransferStatus(), ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new GoogleStorageDeleteFeature(session).delete(Arrays.asList(file, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Arrays.asList(file, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -165,7 +165,7 @@ public class GoogleStorageReadFeatureTest extends AbstractGoogleStorageTest { final CountingInputStream in = new CountingInputStream(new GoogleStorageReadFeature(session).read(file, new TransferStatus(), ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new GoogleStorageDeleteFeature(session).delete(Arrays.asList(file, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Arrays.asList(file, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -191,6 +191,6 @@ public class GoogleStorageReadFeatureTest extends AbstractGoogleStorageTest { in.close(); file.attributes().setVersionId(String.valueOf(out.getStatus().getGeneration())); assertEquals(length, new GoogleStorageAttributesFinderFeature(session).find(file).getSize()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageSearchFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageSearchFeatureTest.java index 622d02ad2c..ccffa9a286 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageSearchFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageSearchFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.features.Delete; @@ -51,7 +51,7 @@ public class GoogleStorageSearchFeatureTest extends AbstractGoogleStorageTest { assertNotNull(feature.search(bucket, new SearchFilter(StringUtils.substring(name, 0, name.length() - 2)), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); final Path subdir = new Path(bucket, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); assertNull(feature.search(subdir, new SearchFilter(name), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -75,6 +75,6 @@ public class GoogleStorageSearchFeatureTest extends AbstractGoogleStorageTest { assertNotNull(result.find(new SimplePathPredicate(filesubdir))); assertEquals(subdir, result.find(new SimplePathPredicate(filesubdir)).getParent()); } - new GoogleStorageDeleteFeature(session).delete(Arrays.asList(file, filesubdir, subdir), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Arrays.asList(file, filesubdir, subdir), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageSessionTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageSessionTest.java index 4e4f4fdb58..b9917d7362 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageSessionTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageSessionTest.java @@ -19,6 +19,7 @@ import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.OAuthTokens; @@ -49,7 +50,7 @@ public class GoogleStorageSessionTest extends AbstractGoogleStorageTest { session.getHost().setCredentials( new Credentials(System.getProperties().getProperty("google.projectid") + "1", null) ); - final LoginConnectionService login = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), + final LoginConnectionService login = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new TestPasswordStore(), ProgressListener.noop); login.check(session, CancelCallback.noop); } @@ -84,7 +85,7 @@ public class GoogleStorageSessionTest extends AbstractGoogleStorageTest { session.getHost().setCredentials( new Credentials("duck-1432", "") ); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); } @Test(expected = LoginCanceledException.class) diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageStorageClassFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageStorageClassFeatureTest.java index 3aa9057099..f5a02c04ed 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageStorageClassFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageStorageClassFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -74,7 +74,7 @@ public class GoogleStorageStorageClassFeatureTest extends AbstractGoogleStorageT feature.setClass(test, "COLDLINE"); assertEquals("COLDLINE", feature.getClass(test)); assertEquals("COLDLINE", new GoogleStorageAttributesFinderFeature(session).find(test).getStorageClass()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,6 +91,6 @@ public class GoogleStorageStorageClassFeatureTest extends AbstractGoogleStorageT feature.setClass(test, "COLDLINE"); assertEquals("COLDLINE", feature.getClass(test)); assertEquals("COLDLINE", new GoogleStorageAttributesFinderFeature(session).find(test).getStorageClass()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageTimestampFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageTimestampFeatureTest.java index fc6290e6c6..ae79e109c3 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageTimestampFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageTimestampFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -82,6 +82,6 @@ public class GoogleStorageTimestampFeatureTest extends AbstractGoogleStorageTest assertEquals(1630305150672L, moved.attributes().getModificationDate()); assertEquals(1630305150672L, new GoogleStorageAttributesFinderFeature(session).find(moved).getModificationDate()); assertNotEquals(eTagAfterPatch, new GoogleStorageAttributesFinderFeature(session).find(moved).getETag()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(moved), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(moved), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageTouchFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageTouchFeatureTest.java index d0cfb46dc0..3c71e0d821 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageTouchFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageTouchFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.googlestorage; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -40,7 +40,7 @@ public class GoogleStorageTouchFeatureTest extends AbstractGoogleStorageTest { new GoogleStorageWriteFeature(session), new Path(bucket, String.format("%s %s", new AlphanumericRandomStringService().random(), new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus().setMime("text/plain")); assertTrue(new GoogleStorageFindFeature(session).find(test)); assertEquals(test.attributes().getVersionId(), new GoogleStorageAttributesFinderFeature(session).find(test).getVersionId()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new GoogleStorageFindFeature(session).find(test)); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageVersioningFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageVersioningFeatureTest.java index c629a6c7df..92ef508bd3 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageVersioningFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageVersioningFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googlestorage; */ import ch.cyberduck.core.AsciiRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.VersioningConfiguration; import ch.cyberduck.core.features.Delete; @@ -43,8 +43,8 @@ public class GoogleStorageVersioningFeatureTest extends AbstractGoogleStorageTes final Path container = new Path(new AsciiRandomStringService().random().toLowerCase(Locale.ROOT), EnumSet.of(Path.Type.directory, Path.Type.volume)); new GoogleStorageDirectoryFeature(session).mkdir(new GoogleStorageWriteFeature(session), container, new TransferStatus()); final Versioning feature = new GoogleStorageVersioningFeature(session); - feature.setConfiguration(container, new DisabledLoginCallback(), new VersioningConfiguration(true, false)); + feature.setConfiguration(container, LoginCallback.noop, new VersioningConfiguration(true, false)); assertTrue(feature.getConfiguration(container).isEnabled()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageWebsiteDistributionConfigurationTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageWebsiteDistributionConfigurationTest.java index 4cf1447bfc..78477858b7 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageWebsiteDistributionConfigurationTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageWebsiteDistributionConfigurationTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.googlestorage; */ import ch.cyberduck.core.AsciiRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cdn.Distribution; import ch.cyberduck.core.cdn.DistributionConfiguration; @@ -51,11 +51,11 @@ public class GoogleStorageWebsiteDistributionConfigurationTest extends AbstractG final DistributionConfiguration configuration = new GoogleStorageWebsiteDistributionConfiguration(session); final Path bucket = new Path(new AsciiRandomStringService().random().toLowerCase(Locale.ROOT), EnumSet.of(Path.Type.directory, Path.Type.volume)); new GoogleStorageDirectoryFeature(session).mkdir(new GoogleStorageWriteFeature(session), bucket, new TransferStatus()); - configuration.write(bucket, new Distribution(Distribution.WEBSITE, null, true), new DisabledLoginCallback()); - final Distribution distribution = configuration.read(bucket, Distribution.WEBSITE, new DisabledLoginCallback()); + configuration.write(bucket, new Distribution(Distribution.WEBSITE, null, true), LoginCallback.noop); + final Distribution distribution = configuration.read(bucket, Distribution.WEBSITE, LoginCallback.noop); assertTrue(distribution.isEnabled()); assertEquals(configuration.getName(), distribution.getName()); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageWriteFeatureTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageWriteFeatureTest.java index bd49204f7e..c98757de6f 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageWriteFeatureTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/GoogleStorageWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.googlestorage; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.BackgroundException; @@ -77,7 +77,7 @@ public class GoogleStorageWriteFeatureTest extends AbstractGoogleStorageTest { metadata.put("k2", "v2"); new GoogleStorageWriteFeature(session).write(test, status, ConnectionCallback.noop).close(); assertEquals(metadata, new GoogleStorageMetadataFeature(session).getMetadata(test)); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) @@ -114,7 +114,7 @@ public class GoogleStorageWriteFeatureTest extends AbstractGoogleStorageTest { assertTrue(new GoogleStorageFindFeature(session).find(test)); assertTrue(new GoogleStorageAccessControlListFeature(session) .getPermission(test).asList().contains(new Acl.UserAndRole(new Acl.GroupUser(Acl.GroupUser.EVERYONE), new Acl.Role(Acl.Role.READ)))); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -132,7 +132,7 @@ public class GoogleStorageWriteFeatureTest extends AbstractGoogleStorageTest { assertTrue(new GoogleStorageFindFeature(session).find(test)); assertFalse(new GoogleStorageAccessControlListFeature(session) .getPermission(test).asList().contains(new Acl.UserAndRole(new Acl.GroupUser(Acl.GroupUser.EVERYONE), new Acl.Role(Acl.Role.READ)))); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -172,7 +172,7 @@ public class GoogleStorageWriteFeatureTest extends AbstractGoogleStorageTest { final PathAttributes attributes = new GoogleStorageAttributesFinderFeature(session).find(test); assertEquals(content.length, attributes.getSize()); } - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -195,6 +195,6 @@ public class GoogleStorageWriteFeatureTest extends AbstractGoogleStorageTest { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java b/googlestorage/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java index e4b4088355..52bb350ef4 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -53,7 +53,7 @@ public class CopyWorkerTest extends AbstractGoogleStorageTest { worker.run(session); assertTrue(new GoogleStorageFindFeature(session).find(source)); assertTrue(new GoogleStorageFindFeature(session).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(source, target), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(source, target), ProgressListener.noop).run(session); } @Test @@ -71,7 +71,7 @@ public class CopyWorkerTest extends AbstractGoogleStorageTest { worker.run(session); assertTrue(new GoogleStorageFindFeature(session).find(sourceFile)); assertTrue(new GoogleStorageFindFeature(session).find(targetFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); } @Test @@ -92,6 +92,6 @@ public class CopyWorkerTest extends AbstractGoogleStorageTest { assertTrue(new GoogleStorageFindFeature(session).find(targetFile)); assertTrue(new GoogleStorageFindFeature(session).find(folder)); assertTrue(new GoogleStorageFindFeature(session).find(sourceFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(folder, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(folder, targetFolder), ProgressListener.noop).run(session); } } diff --git a/googlestorage/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java b/googlestorage/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java index d013371cc1..35fa8442cf 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.worker; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -55,7 +55,7 @@ public class DeleteWorkerTest extends AbstractGoogleStorageTest { new GoogleStorageWriteFeature(session), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotNull(file.attributes().getVersionId()); assertTrue(new GoogleStorageFindFeature(session).find(file)); - final DeleteWorker worker = new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(folder), ProgressListener.noop); + final DeleteWorker worker = new DeleteWorker(LoginCallback.noop, Collections.singletonList(folder), ProgressListener.noop); int hashCode = worker.hashCode(); worker.run(session); assertEquals(hashCode, worker.hashCode()); diff --git a/googlestorage/src/test/java/ch/cyberduck/core/worker/GoogleStorageSingleTransferWorkerTest.java b/googlestorage/src/test/java/ch/cyberduck/core/worker/GoogleStorageSingleTransferWorkerTest.java index 77c3408ffc..bf23d73f7f 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/worker/GoogleStorageSingleTransferWorkerTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/worker/GoogleStorageSingleTransferWorkerTest.java @@ -17,9 +17,9 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -90,11 +90,11 @@ public class GoogleStorageSingleTransferWorkerTest extends AbstractGoogleStorage return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertArrayEquals(content, IOUtils.toByteArray(localFile.getInputStream())); - new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GoogleStorageDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); localFile.delete(); } } diff --git a/hubic/src/test/java/ch/cyberduck/core/hubic/HubicSessionTest.java b/hubic/src/test/java/ch/cyberduck/core/hubic/HubicSessionTest.java index 5c81afa1c1..08ad89d8b5 100644 --- a/hubic/src/test/java/ch/cyberduck/core/hubic/HubicSessionTest.java +++ b/hubic/src/test/java/ch/cyberduck/core/hubic/HubicSessionTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.hubic; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.exception.LoginCanceledException; @@ -48,9 +48,9 @@ public class HubicSessionTest { this.getClass().getResourceAsStream("/hubiC.cyberduckprofile")); final HubicSession session = new HubicSession(new Host(profile, new HubicProtocol().getDefaultHostname(), new Credentials("u@domain")), new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); try { - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); } catch(LoginFailureException e) { assertEquals("Invalid refresh token. Please contact your web hosting service provider for assistance.", e.getDetail()); @@ -66,8 +66,8 @@ public class HubicSessionTest { this.getClass().getResourceAsStream("/hubiC.cyberduckprofile")); final HubicSession session = new HubicSession(new Host(profile, new HubicProtocol().getDefaultHostname(), new Credentials("u@domain")), new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); session.close(); } } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSAttributesFinderFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSAttributesFinderFeatureTest.java index 7f993e788e..a3ae0a52dd 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSAttributesFinderFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSAttributesFinderFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.Profile; @@ -54,8 +54,8 @@ public class IRODSAttributesFinderFeatureTest extends IRODSDockerComposeManager PROPERTIES.get("irods.key"), PROPERTIES.get("irods.secret") )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); new IRODSAttributesFinderFeature(session).find(new Path(UUID.randomUUID().toString(), EnumSet.of(Path.Type.file))); } @@ -68,8 +68,8 @@ public class IRODSAttributesFinderFeatureTest extends IRODSDockerComposeManager PROPERTIES.get("irods.key"), PROPERTIES.get("irods.secret") )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path folder = new IRODSDirectoryFeature(session).mkdir(new IRODSWriteFeature(session), new Path( new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)), new TransferStatus()); @@ -80,7 +80,7 @@ public class IRODSAttributesFinderFeatureTest extends IRODSDockerComposeManager assertEquals(folderTimestamp, f.find(folder).getModificationDate()); final PathAttributes attributes = f.find(test); assertEquals(0L, attributes.getSize()); - new IRODSDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new IRODSFindFeature(session).find(test)); session.close(); } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSCopyFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSCopyFeatureTest.java index 38e7b6e96b..8c6a6b754d 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSCopyFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSCopyFeatureTest.java @@ -20,8 +20,8 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -57,15 +57,15 @@ public class IRODSCopyFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new IRODSTouchFeature(session).touch(new IRODSWriteFeature(session), test, new TransferStatus()); final Path copy = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new IRODSCopyFeature(session).copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new IRODSFindFeature(session).find(test)); assertTrue(new IRODSFindFeature(session).find(copy)); - new IRODSDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSDeleteFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSDeleteFeatureTest.java index 2e5920df0b..df24390b7e 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSDeleteFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSDeleteFeatureTest.java @@ -19,8 +19,8 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -56,8 +56,8 @@ public class IRODSDeleteFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path folder = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new IRODSDirectoryFeature(session).mkdir(new IRODSWriteFeature(session), folder, new TransferStatus()); @@ -65,7 +65,7 @@ public class IRODSDeleteFeatureTest extends IRODSDockerComposeManager { new IRODSTouchFeature(session).touch(new IRODSWriteFeature(session), file, new TransferStatus()); assertTrue(new IRODSFindFeature(session).find(folder)); assertTrue(new IRODSFindFeature(session).find(file)); - new IRODSDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new IRODSFindFeature(session).find(folder)); assertFalse(new IRODSFindFeature(session).find(file)); session.close(); @@ -80,10 +80,10 @@ public class IRODSDeleteFeatureTest extends IRODSDockerComposeManager { PROPERTIES.get("irods.key"), PROPERTIES.get("irods.secret") )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); assertFalse(new IRODSFindFeature(session).find(test)); - new IRODSDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSDirectoryFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSDirectoryFeatureTest.java index 97a75763ba..208c488e52 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSDirectoryFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSDirectoryFeatureTest.java @@ -20,8 +20,8 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -57,14 +57,14 @@ public class IRODSDirectoryFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new IRODSDirectoryFeature(session).mkdir(new IRODSWriteFeature(session), test, new TransferStatus()); assertTrue(session.getFeature(Find.class).find(test)); - session.getFeature(Delete.class).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session.getFeature(Delete.class).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); session.close(); } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSFindFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSFindFeatureTest.java index f3ada8e3f9..df0c228c7d 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSFindFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSFindFeatureTest.java @@ -19,8 +19,8 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -55,14 +55,14 @@ public class IRODSFindFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new IRODSDirectoryFeature(session).mkdir(new IRODSWriteFeature(session), test, new TransferStatus()); assertTrue(new IRODSFindFeature(session).find(test)); - session.getFeature(Delete.class).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session.getFeature(Delete.class).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new IRODSFindFeature(session).find(test)); session.close(); } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSListServiceTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSListServiceTest.java index ac4ee547ad..e99101090a 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSListServiceTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSListServiceTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -56,10 +56,10 @@ public class IRODSListServiceTest extends IRODSDockerComposeManager { final IRODSSession session = new IRODSSession(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final AttributedList list = new IRODSListService(session).list(new IRODSHomeFinderService(session).find(), new DisabledListProgressListener()); assertTrue(list.isEmpty()); for(Path p : list) { @@ -80,8 +80,8 @@ public class IRODSListServiceTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path f = new Path(UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final IRODSListService service = new IRODSListService(session); service.list(f, new DisabledListProgressListener()); diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSMoveFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSMoveFeatureTest.java index fe5b229bbd..858204d799 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSMoveFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSMoveFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -58,8 +58,8 @@ public class IRODSMoveFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path source = new Path(new IRODSHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path destination = new Path(new IRODSHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); @@ -73,7 +73,7 @@ public class IRODSMoveFeatureTest extends IRODSDockerComposeManager { assertFalse(session.getFeature(Find.class).find(new Path(source, filename, EnumSet.of(Path.Type.file)))); assertTrue(session.getFeature(Find.class).find(destination)); assertTrue(session.getFeature(Find.class).find(new Path(destination, filename, EnumSet.of(Path.Type.file)))); - session.getFeature(Delete.class).delete(Collections.singletonList(destination), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session.getFeature(Delete.class).delete(Collections.singletonList(destination), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(destination)); session.close(); } @@ -88,8 +88,8 @@ public class IRODSMoveFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path source = new Path(new IRODSHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path destination = new Path(new IRODSHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); @@ -98,7 +98,7 @@ public class IRODSMoveFeatureTest extends IRODSDockerComposeManager { new IRODSMoveFeature(session).move(source, destination, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(session.getFeature(Find.class).find(source)); assertTrue(session.getFeature(Find.class).find(destination)); - session.getFeature(Delete.class).delete(Collections.singletonList(destination), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session.getFeature(Delete.class).delete(Collections.singletonList(destination), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(destination)); session.close(); } @@ -113,8 +113,8 @@ public class IRODSMoveFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path source = new Path(new IRODSHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path destination = new Path(new IRODSHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSPamAuthenticationTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSPamAuthenticationTest.java index 7d0abb6d26..47f3482141 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSPamAuthenticationTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSPamAuthenticationTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.exception.BackgroundException; @@ -137,10 +137,10 @@ public class IRODSPamAuthenticationTest { try { final IRODSSession session = new IRODSSession(host, cyberduckTrustManager, null); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); session.close(); assertFalse(session.isConnected()); @@ -176,10 +176,10 @@ public class IRODSPamAuthenticationTest { try { final IRODSSession session = new IRODSSession(host, cyberduckTrustManager, null); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - assertThrows(BackgroundException.class, () -> session.login(new DisabledLoginCallback(), CancelCallback.noop)); + assertThrows(BackgroundException.class, () -> session.login(LoginCallback.noop, CancelCallback.noop)); session.close(); assertFalse(session.isConnected()); diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSReadFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSReadFeatureTest.java index a2d3d2f4ea..a46e70b4bc 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSReadFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSReadFeatureTest.java @@ -20,9 +20,9 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProgressListener; @@ -69,8 +69,8 @@ public class IRODSReadFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); assertFalse(session.getFeature(Find.class).find(test)); @@ -90,7 +90,7 @@ public class IRODSReadFeatureTest extends IRODSDockerComposeManager { assertNotNull(in); in.close(); - session.getFeature(Delete.class).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session.getFeature(Delete.class).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); session.close(); } @@ -105,8 +105,8 @@ public class IRODSReadFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); assertFalse(session.getFeature(Find.class).find(test)); @@ -124,8 +124,8 @@ public class IRODSReadFeatureTest extends IRODSDockerComposeManager { PROPERTIES.get("irods.key"), PROPERTIES.get("irods.secret") )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new IRODSTouchFeature(session).touch(new IRODSWriteFeature(session), test, new TransferStatus()); @@ -151,7 +151,7 @@ public class IRODSReadFeatureTest extends IRODSDockerComposeManager { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new IRODSDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSSessionTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSSessionTest.java index 64be0ce600..2f12b4b457 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSSessionTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSSessionTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -54,7 +54,7 @@ public class IRODSSessionTest extends IRODSDockerComposeManager { final IRODSSession session = new IRODSSession(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); @@ -73,11 +73,11 @@ public class IRODSSessionTest extends IRODSDockerComposeManager { final IRODSSession session = new IRODSSession(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final AttributedList list = new IRODSListService(session).list(new IRODSHomeFinderService(session).find(), new DisabledListProgressListener()); assertTrue(list.isEmpty()); @@ -99,11 +99,11 @@ public class IRODSSessionTest extends IRODSDockerComposeManager { final IRODSSession session = new IRODSSession(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); assertTrue(session.isConnected()); session.close(); @@ -118,9 +118,9 @@ public class IRODSSessionTest extends IRODSDockerComposeManager { final Host host = new Host(profile, profile.getDefaultHostname(), new Credentials("a", "a")); final IRODSSession session = new IRODSSession(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); } } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSTouchFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSTouchFeatureTest.java index c0957588b8..fd00d7d7d7 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSTouchFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSTouchFeatureTest.java @@ -19,8 +19,8 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -55,12 +55,12 @@ public class IRODSTouchFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new IRODSTouchFeature(session).touch(new IRODSWriteFeature(session), test, new TransferStatus()); assertTrue(new IRODSFindFeature(session).find(test)); - new IRODSDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new IRODSFindFeature(session).find(test)); session.close(); } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSUploadFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSUploadFeatureTest.java index 4976c8a0d4..c24efba3dc 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSUploadFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSUploadFeatureTest.java @@ -21,9 +21,9 @@ import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProgressListener; @@ -68,8 +68,8 @@ public class IRODSUploadFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Local local = new Local(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); final int length = 32770; final byte[] content = RandomUtils.nextBytes(length); @@ -99,7 +99,7 @@ public class IRODSUploadFeatureTest extends IRODSDockerComposeManager { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new IRODSDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); session.close(); } @@ -114,8 +114,8 @@ public class IRODSUploadFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Local local = new Local(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); final int length = 32770; final byte[] content = RandomUtils.nextBytes(length); @@ -134,7 +134,7 @@ public class IRODSUploadFeatureTest extends IRODSDockerComposeManager { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new IRODSDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } @@ -148,8 +148,8 @@ public class IRODSUploadFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Local local = new Local(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); final int length = 32770; final byte[] content = RandomUtils.nextBytes(length); @@ -179,7 +179,7 @@ public class IRODSUploadFeatureTest extends IRODSDockerComposeManager { // } assertFalse(status.isComplete()); - new IRODSDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } @@ -193,8 +193,8 @@ public class IRODSUploadFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Local local = new Local(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); final int length = 33 * 1024 * 1024; // Triggers parallel transfer final byte[] content = RandomUtils.nextBytes(length); @@ -224,7 +224,7 @@ public class IRODSUploadFeatureTest extends IRODSDockerComposeManager { // } assertFalse(status.isComplete()); - new IRODSDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new IRODSDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } } diff --git a/irods/src/test/java/ch/cyberduck/core/irods/IRODSWriteFeatureTest.java b/irods/src/test/java/ch/cyberduck/core/irods/IRODSWriteFeatureTest.java index 3317151f1d..cf5a965ea2 100644 --- a/irods/src/test/java/ch/cyberduck/core/irods/IRODSWriteFeatureTest.java +++ b/irods/src/test/java/ch/cyberduck/core/irods/IRODSWriteFeatureTest.java @@ -20,8 +20,8 @@ package ch.cyberduck.core.irods; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.Profile; @@ -67,12 +67,12 @@ public class IRODSWriteFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session1 = new IRODSSession(host); - session1.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session1.login(new DisabledLoginCallback(), CancelCallback.noop); + session1.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session1.login(LoginCallback.noop, CancelCallback.noop); final IRODSSession session2 = new IRODSSession(host); - session2.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session2.login(new DisabledLoginCallback(), CancelCallback.noop); + session2.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session2.login(LoginCallback.noop, CancelCallback.noop); final Path test1 = new Path(new IRODSHomeFinderService(session1).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final Path test2 = new Path(new IRODSHomeFinderService(session2).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); @@ -100,11 +100,11 @@ public class IRODSWriteFeatureTest extends IRODSDockerComposeManager { assertArrayEquals(content, buffer2); } - session1.getFeature(Delete.class).delete(Collections.singletonList(test1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session1.getFeature(Delete.class).delete(Collections.singletonList(test1), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session1.getFeature(Find.class).find(test1)); session1.close(); - session2.getFeature(Delete.class).delete(Collections.singletonList(test2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session2.getFeature(Delete.class).delete(Collections.singletonList(test2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session2.getFeature(Find.class).find(test2)); session2.close(); } @@ -119,12 +119,12 @@ public class IRODSWriteFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session1 = new IRODSSession(host); - session1.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session1.login(new DisabledLoginCallback(), CancelCallback.noop); + session1.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session1.login(LoginCallback.noop, CancelCallback.noop); final IRODSSession session2 = new IRODSSession(host); - session2.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session2.login(new DisabledLoginCallback(), CancelCallback.noop); + session2.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session2.login(LoginCallback.noop, CancelCallback.noop); final CountDownLatch cw1 = new CountDownLatch(1); final CountDownLatch cw2 = new CountDownLatch(1); @@ -208,11 +208,11 @@ public class IRODSWriteFeatureTest extends IRODSDockerComposeManager { cr1.await(); cr2.await(); - session1.getFeature(Delete.class).delete(Collections.singletonList(test1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session1.getFeature(Delete.class).delete(Collections.singletonList(test1), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session1.getFeature(Find.class).find(test1)); session1.close(); - session2.getFeature(Delete.class).delete(Collections.singletonList(test2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session2.getFeature(Delete.class).delete(Collections.singletonList(test2), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session2.getFeature(Find.class).find(test2)); session2.close(); } @@ -227,8 +227,8 @@ public class IRODSWriteFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); assertFalse(session.getFeature(Find.class).find(test)); @@ -285,7 +285,7 @@ public class IRODSWriteFeatureTest extends IRODSDockerComposeManager { assertArrayEquals(newcontent, buffer); } - session.getFeature(Delete.class).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session.getFeature(Delete.class).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); session.close(); } @@ -300,8 +300,8 @@ public class IRODSWriteFeatureTest extends IRODSDockerComposeManager { )); final IRODSSession session = new IRODSSession(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path(new IRODSHomeFinderService(session).find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); assertFalse(session.getFeature(Find.class).find(test)); @@ -362,7 +362,7 @@ public class IRODSWriteFeatureTest extends IRODSDockerComposeManager { System.arraycopy(content_append, 0, complete, content.length, content_append.length); assertArrayEquals(complete, buffer_complete); - session.getFeature(Delete.class).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + session.getFeature(Delete.class).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); session.close(); } diff --git a/manta/src/test/java/ch/cyberduck/core/manta/AbstractMantaTest.java b/manta/src/test/java/ch/cyberduck/core/manta/AbstractMantaTest.java index 03f28bedf5..7ce6b4be8f 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/AbstractMantaTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/AbstractMantaTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AbstractPath.Type; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -77,8 +77,8 @@ public abstract class AbstractMantaTest extends VaultTest { final String user = PROPERTIES.get("manta.user"); final Host host = new Host(profile, hostname, new Credentials(user).setIdentity(file)); session = new MantaSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final String testRoot = "cyberduck-test-" + new AlphanumericRandomStringService().random(); testPathPrefix = new Path(new MantaAccountHomeInfo(host.getCredentials().getUsername(), host.getDefaultPath()).getAccountPrivateRoot(), testRoot, EnumSet.of(Type.directory)); session.getClient().putDirectory(testPathPrefix.getAbsolute()); diff --git a/manta/src/test/java/ch/cyberduck/core/manta/MantaAttributesFinderFeatureTest.java b/manta/src/test/java/ch/cyberduck/core/manta/MantaAttributesFinderFeatureTest.java index 04431ffdf5..6f02a4c655 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/MantaAttributesFinderFeatureTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/MantaAttributesFinderFeatureTest.java @@ -15,7 +15,7 @@ package ch.cyberduck.core.manta; * GNU General Public License for more details. */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -53,6 +53,6 @@ public class MantaAttributesFinderFeatureTest extends AbstractMantaTest { assertEquals(-1L, attributes.getCreationDate()); assertNotEquals(-1L, attributes.getModificationDate()); assertNotNull(attributes.getETag()); - new MantaDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/manta/src/test/java/ch/cyberduck/core/manta/MantaDirectoryFeatureTest.java b/manta/src/test/java/ch/cyberduck/core/manta/MantaDirectoryFeatureTest.java index be1c70715d..db75cb78e9 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/MantaDirectoryFeatureTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/MantaDirectoryFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.manta; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Attributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.Permission; @@ -42,7 +42,7 @@ public class MantaDirectoryFeatureTest extends AbstractMantaTest { final Path target = new MantaDirectoryFeature(session).mkdir(new MantaWriteFeature(session), randomDirectory(), null); final PathAttributes found = new MantaAttributesFinderFeature(session).find(target); assertNotEquals(Permission.EMPTY, found.getPermission()); - new MantaDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -58,6 +58,6 @@ public class MantaDirectoryFeatureTest extends AbstractMantaTest { final Attributes found = new MantaAttributesFinderFeature(session).find(target); assertNull(found.getOwner()); assertNotEquals(Permission.EMPTY, found.getPermission()); - new MantaDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/manta/src/test/java/ch/cyberduck/core/manta/MantaListServiceTest.java b/manta/src/test/java/ch/cyberduck/core/manta/MantaListServiceTest.java index b5bd6bb512..06b20f29af 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/MantaListServiceTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/MantaListServiceTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.manta; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -47,7 +47,7 @@ public class MantaListServiceTest extends AbstractMantaTest { final Path folder = new MantaDirectoryFeature(session).mkdir(new MantaWriteFeature(session), new Path( testPathPrefix, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new MantaListService(session).list(folder, new DisabledListProgressListener()).isEmpty()); - new MantaDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/manta/src/test/java/ch/cyberduck/core/manta/MantaMoveFeatureTest.java b/manta/src/test/java/ch/cyberduck/core/manta/MantaMoveFeatureTest.java index 2d715d2b14..847eef0a86 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/MantaMoveFeatureTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/MantaMoveFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.manta; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.features.AttributesFinder; @@ -56,7 +56,7 @@ public class MantaMoveFeatureTest extends AbstractMantaTest { assertFalse(new MantaFindFeature(session).find(file)); assertTrue(new MantaFindFeature(session).find(rename)); assertNotNull(attributesFinder.find(rename)); - delete.delete(Collections.singletonList(rename), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(rename), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -79,7 +79,7 @@ public class MantaMoveFeatureTest extends AbstractMantaTest { assertNotNull(attributesFinder.find(rename)); assertFalse(new MantaFindFeature(session).find(touchedFile)); assertTrue(new MantaFindFeature(session).find(rename)); - delete.delete(Collections.singletonList(targetDirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(targetDirectory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -102,6 +102,6 @@ public class MantaMoveFeatureTest extends AbstractMantaTest { assertNotNull(attributesFinder.find(rename)); assertFalse(new MantaFindFeature(session).find(touchedFile)); assertTrue(new MantaFindFeature(session).find(rename)); - delete.delete(Collections.singletonList(targetDirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(targetDirectory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/manta/src/test/java/ch/cyberduck/core/manta/MantaPublicKeyAuthenticationTest.java b/manta/src/test/java/ch/cyberduck/core/manta/MantaPublicKeyAuthenticationTest.java index 1d85b5cd8e..2f0eede26b 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/MantaPublicKeyAuthenticationTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/MantaPublicKeyAuthenticationTest.java @@ -20,6 +20,7 @@ import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.exception.LoginCanceledException; import ch.cyberduck.core.local.DefaultLocalTouchFeature; @@ -65,7 +66,7 @@ public class MantaPublicKeyAuthenticationTest extends VaultTest { final String hostname = new URL(PROPERTIES.get("manta.url")).getHost(); final Host host = new Host(new MantaProtocol(), hostname, credentials); final MantaSession session = new MantaSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); session.login( new DisabledLoginCallback() { @Override @@ -107,7 +108,7 @@ public class MantaPublicKeyAuthenticationTest extends VaultTest { final String hostname = new URL(PROPERTIES.get("manta.url")).getHost(); final Host host = new Host(new MantaProtocol(), hostname, credentials); final MantaSession session = new MantaSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); session.login( new DisabledLoginCallback() { @Override diff --git a/manta/src/test/java/ch/cyberduck/core/manta/MantaReadFeatureTest.java b/manta/src/test/java/ch/cyberduck/core/manta/MantaReadFeatureTest.java index 174a906220..829031ef32 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/MantaReadFeatureTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/MantaReadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.manta; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.exception.NotfoundException; @@ -78,7 +78,7 @@ public class MantaReadFeatureTest extends AbstractMantaTest { in.close(); } final MantaDeleteFeature delete = new MantaDeleteFeature(session); - delete.delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -118,7 +118,7 @@ public class MantaReadFeatureTest extends AbstractMantaTest { System.arraycopy(content, BYTES_OFFSET, reference, 0, content.length - BYTES_OFFSET); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new MantaDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -150,6 +150,6 @@ public class MantaReadFeatureTest extends AbstractMantaTest { assertArrayEquals(reference, buffer.toByteArray()); in.close(); final MantaDeleteFeature delete = new MantaDeleteFeature(session); - delete.delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/manta/src/test/java/ch/cyberduck/core/manta/MantaTouchFeatureTest.java b/manta/src/test/java/ch/cyberduck/core/manta/MantaTouchFeatureTest.java index 7617c940f2..02c3d1515b 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/MantaTouchFeatureTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/MantaTouchFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.manta; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.RandomStringService; import ch.cyberduck.core.features.Delete; @@ -42,7 +42,7 @@ public class MantaTouchFeatureTest extends AbstractMantaTest { EnumSet.of(Path.Type.file)); new MantaTouchFeature(session).touch(new MantaWriteFeature(session), file, new TransferStatus().setMime("x-application/cyberduck")); assertNotNull(new MantaAttributesFinderFeature(session).find(file)); - new MantaDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -54,6 +54,6 @@ public class MantaTouchFeatureTest extends AbstractMantaTest { EnumSet.of(Path.Type.file)); new MantaTouchFeature(session).touch(new MantaWriteFeature(session), file, new TransferStatus().setMime("x-application/cyberduck")); assertNotNull(new MantaAttributesFinderFeature(session).find(file)); - new MantaDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/manta/src/test/java/ch/cyberduck/core/manta/MantaWriteFeatureTest.java b/manta/src/test/java/ch/cyberduck/core/manta/MantaWriteFeatureTest.java index a78b3fadaa..7c1d7008d5 100644 --- a/manta/src/test/java/ch/cyberduck/core/manta/MantaWriteFeatureTest.java +++ b/manta/src/test/java/ch/cyberduck/core/manta/MantaWriteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.manta; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -62,7 +62,7 @@ public class MantaWriteFeatureTest extends AbstractMantaTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new MantaDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -83,6 +83,6 @@ public class MantaWriteFeatureTest extends AbstractMantaTest { out.close(); final PathAttributes found = new MantaAttributesFinderFeature(session).find(file); assertEquals(found.getSize(), content.length); - new MantaDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new MantaDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudAttributesFinderFeatureTest.java b/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudAttributesFinderFeatureTest.java index 763ef21051..d48d86bc1e 100644 --- a/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudAttributesFinderFeatureTest.java +++ b/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudAttributesFinderFeatureTest.java @@ -3,8 +3,8 @@ package ch.cyberduck.core.nextcloud; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -87,7 +87,7 @@ public class NextcloudAttributesFinderFeatureTest extends AbstractNextcloudTest // Expected } finally { - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudListServiceTest.java b/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudListServiceTest.java index 066a3c7ed0..09eb616e3e 100644 --- a/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudListServiceTest.java +++ b/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudListServiceTest.java @@ -20,7 +20,7 @@ package ch.cyberduck.core.nextcloud; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.Protocol; @@ -63,7 +63,7 @@ public class NextcloudListServiceTest extends AbstractNextcloudTest { new DisabledListProgressListener()); } finally { - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -88,7 +88,7 @@ public class NextcloudListServiceTest extends AbstractNextcloudTest { assertNotNull(list.find(new SimplePathPredicate(test)).attributes().getFileId()); } finally { - new DAVDeleteFeature(session).delete(Arrays.asList(test, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(test, directory), LoginCallback.noop, new Delete.DisabledCallback()); } } } diff --git a/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudVersioningFeatureTest.java b/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudVersioningFeatureTest.java index fd92c6ed69..a6929f6076 100644 --- a/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudVersioningFeatureTest.java +++ b/nextcloud/src/test/java/ch/cyberduck/core/nextcloud/NextcloudVersioningFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.dav.DAVDeleteFeature; @@ -81,20 +81,20 @@ public class NextcloudVersioningFeatureTest extends AbstractNextcloudTest { assertNotEquals(initialAttributes, new NextcloudAttributesFinderFeature(session).find(test)); assertEquals(initialVersion.attributes(), new NextcloudAttributesFinderFeature(session).find(initialVersion)); { - final InputStream reader = new NextcloudReadFeature(session).read(initialVersion, new TransferStatus(), new DisabledLoginCallback()); + final InputStream reader = new NextcloudReadFeature(session).read(initialVersion, new TransferStatus(), LoginCallback.noop); assertArrayEquals(initialContent, IOUtils.readFully(reader, initialContent.length)); reader.close(); } final Path updatedVersion = versions.get(0); assertEquals(contentUpdate.length, new NextcloudAttributesFinderFeature(session).find(updatedVersion).getSize()); { - final InputStream reader = new NextcloudReadFeature(session).read(updatedVersion, new TransferStatus(), new DisabledLoginCallback()); + final InputStream reader = new NextcloudReadFeature(session).read(updatedVersion, new TransferStatus(), LoginCallback.noop); assertArrayEquals(contentUpdate, IOUtils.readFully(reader, contentUpdate.length)); reader.close(); } } feature.revert(initialVersion); assertEquals(initialVersion.attributes().getModificationDate(), new NextcloudAttributesFinderFeature(session).find(test).getModificationDate()); - new DAVDeleteFeature(session).delete(Arrays.asList(test, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(test, directory), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/nio/src/test/java/ch/cyberduck/core/cryptomator/CryptoLocalSingleTransferWorkerTest.java b/nio/src/test/java/ch/cyberduck/core/cryptomator/CryptoLocalSingleTransferWorkerTest.java index 1f50e28622..71d191e16b 100644 --- a/nio/src/test/java/ch/cyberduck/core/cryptomator/CryptoLocalSingleTransferWorkerTest.java +++ b/nio/src/test/java/ch/cyberduck/core/cryptomator/CryptoLocalSingleTransferWorkerTest.java @@ -19,10 +19,10 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; @@ -91,8 +91,8 @@ public class CryptoLocalSingleTransferWorkerTest { @Test public void testUpload() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new LocalHomeFinderFeature().find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); StringBuilder directoryname = new StringBuilder(); @@ -129,7 +129,7 @@ public class CryptoLocalSingleTransferWorkerTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertTrue(cryptomator.getFeature(session, Find.class, new LocalFindFeature(session)).find(dir1)); @@ -147,7 +147,7 @@ public class CryptoLocalSingleTransferWorkerTest { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new LocalDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new LocalDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalAttributesFinderFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalAttributesFinderFeatureTest.java index 7bb19d4548..e380565d9c 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalAttributesFinderFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalAttributesFinderFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.nio; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -42,8 +42,8 @@ public class LocalAttributesFinderFeatureTest { @Test public void testFindRoot() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final LocalAttributesFinderFeature f = new LocalAttributesFinderFeature(session); assertNotNull(f.find(new Path("/", EnumSet.of(Path.Type.directory)))); assertNotEquals(PathAttributes.EMPTY, f.find(new Path("/", EnumSet.of(Path.Type.directory)))); @@ -53,8 +53,8 @@ public class LocalAttributesFinderFeatureTest { public void testConvert() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); assumeTrue(session.isPosixFilesystem()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path file = new Path(new LocalHomeFinderFeature().find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), file, new TransferStatus()); final java.nio.file.Path local = session.toPath(file); @@ -71,6 +71,6 @@ public class LocalAttributesFinderFeatureTest { assertEquals(posixAttributes.lastModifiedTime().toMillis(), finder.find(file).getModificationDate()); assertEquals(posixAttributes.creationTime().toMillis(), finder.find(file).getCreationDate()); assertEquals(posixAttributes.lastAccessTime().toMillis(), finder.find(file).getAccessedDate()); - new LocalDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalDeleteFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalDeleteFeatureTest.java index 209d30e877..0e9a11ccda 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalDeleteFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalDeleteFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.nio; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.proxy.DisabledProxyFinder; @@ -41,13 +41,13 @@ public class LocalDeleteFeatureTest { @Test public void testDelete() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path file = new Path(new LocalHomeFinderFeature().find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), file, new TransferStatus()); final Path folder = new Path(new LocalHomeFinderFeature().find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); new LocalDirectoryFeature(session).mkdir(new LocalWriteFeature(session), folder, new TransferStatus()); - new LocalDeleteFeature(session).delete(new ArrayList<>(Arrays.asList(file, folder)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(new ArrayList<>(Arrays.asList(file, folder)), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(Files.exists(session.toPath(file))); assertFalse(Files.exists(session.toPath(folder))); } @@ -55,15 +55,15 @@ public class LocalDeleteFeatureTest { @Test public void testDeleteSymlink() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path folder = new Path(new LocalHomeFinderFeature().find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); new LocalDirectoryFeature(session).mkdir(new LocalWriteFeature(session), folder, new TransferStatus()); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), file, new TransferStatus()); final Path symlink = new Path(new LocalHomeFinderFeature().find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new LocalSymlinkFeature(session).symlink(symlink, folder.getAbsolute()); - new LocalDeleteFeature(session).delete(new ArrayList<>(Collections.singletonList(symlink)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(new ArrayList<>(Collections.singletonList(symlink)), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(Files.exists(session.toPath(symlink))); assertTrue(Files.exists(session.toPath(folder))); } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalDirectoryFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalDirectoryFeatureTest.java index 7cf397c3c5..1722174de6 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalDirectoryFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalDirectoryFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.nio; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.AccessDeniedException; import ch.cyberduck.core.exception.ConflictException; @@ -40,24 +40,24 @@ public class LocalDirectoryFeatureTest { @Test public void testCreateFolder() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path folder = new Path(new LocalHomeFinderFeature().find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new LocalDirectoryFeature(session).mkdir(new LocalWriteFeature(session), folder, new TransferStatus()); assertTrue(Files.exists(session.toPath(folder))); assertThrows(ConflictException.class, () -> new LocalDirectoryFeature(session).mkdir(new LocalWriteFeature(session), folder, new TransferStatus())); - new LocalDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(Files.exists(session.toPath(folder))); } @Test(expected = AccessDeniedException.class) public void testFolderExists() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path folder = new Path(new LocalHomeFinderFeature().find(), UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new LocalDirectoryFeature(session).mkdir(new LocalWriteFeature(session), folder, new TransferStatus()); new LocalDirectoryFeature(session).mkdir(new LocalWriteFeature(session), folder, new TransferStatus()); - new LocalDeleteFeature(session).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalFindFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalFindFeatureTest.java index 80c0551896..cdf9cb6fdd 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalFindFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalFindFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.nio; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.proxy.DisabledProxyFinder; import ch.cyberduck.core.threading.CancelCallback; @@ -39,8 +39,8 @@ public class LocalFindFeatureTest { @Test public void testFindNotFound() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); assertFalse(new LocalFindFeature(session).find(new Path(UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)))); session.close(); } @@ -49,8 +49,8 @@ public class LocalFindFeatureTest { public void testFindSymlink() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); assumeTrue(session.isPosixFilesystem()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new LocalHomeFinderFeature().find(); final Path file = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file, Path.Type.symboliclink)); // Symlink to non existing target @@ -62,8 +62,8 @@ public class LocalFindFeatureTest { @Test public void testFindCaseSensitive() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new LocalHomeFinderFeature().find(); final Path file = new LocalTouchFeature(session).touch(new LocalWriteFeature(session), new Path(home, StringUtils.lowerCase(new AsciiRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new LocalFindFeature(session).find(file)); @@ -74,8 +74,8 @@ public class LocalFindFeatureTest { @Test public void testFindDirectory() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new LocalHomeFinderFeature().find(); assertTrue(new LocalFindFeature(session).find(home)); session.close(); @@ -84,8 +84,8 @@ public class LocalFindFeatureTest { @Test public void testFindRoot() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); assertTrue(new LocalFindFeature(session).find(new Path("/", EnumSet.of(Path.Type.directory)))); } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalHomeFinderFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalHomeFinderFeatureTest.java index 1d8c722107..b2a9c1cbac 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalHomeFinderFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalHomeFinderFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.nio; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.proxy.DisabledProxyFinder; import ch.cyberduck.core.threading.CancelCallback; @@ -31,8 +31,8 @@ public class LocalHomeFinderFeatureTest { @Test public void testFind() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); assertTrue(new LocalHomeFinderFeature().find().getAbsolute().endsWith( System.getProperty("user.home").replaceAll("\\\\", "/"))); session.close(); @@ -41,8 +41,8 @@ public class LocalHomeFinderFeatureTest { @Test public void testWindowsHome() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); assertEquals("/C:/Users/Default", new LocalHomeFinderFeature().toPath("C:\\Users\\Default").getAbsolute()); session.close(); } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalListServiceTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalListServiceTest.java index cb99d3b40c..b748981fa3 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalListServiceTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalListServiceTest.java @@ -20,9 +20,9 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Factory; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.AccessDeniedException; import ch.cyberduck.core.exception.NotfoundException; @@ -45,10 +45,10 @@ public class LocalListServiceTest { @Test public void testList() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new LocalHomeFinderFeature().find(); final Path file = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path directory = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); @@ -57,7 +57,7 @@ public class LocalListServiceTest { final AttributedList list = new LocalListService(session).list(home, new DisabledListProgressListener()); assertTrue(list.contains(file)); assertTrue(list.contains(directory)); - new LocalDeleteFeature(session).delete(Arrays.asList(file, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Arrays.asList(file, directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new LocalListService(session).list(home, new DisabledListProgressListener()).contains(file)); assertFalse(new LocalListService(session).list(home, new DisabledListProgressListener()).contains(directory)); session.close(); @@ -67,10 +67,10 @@ public class LocalListServiceTest { public void testDifferentDrive() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); if(!session.isPosixFilesystem()) { - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path test = new Path("/D:/", EnumSet.of(Path.Type.directory, Path.Type.volume)); final AttributedList list = new LocalListService(session).list(test, new DisabledListProgressListener()); assertNotSame(AttributedList.emptyList(), list); @@ -82,10 +82,10 @@ public class LocalListServiceTest { public void testListSymlink() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); assumeTrue(session.isPosixFilesystem()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new LocalHomeFinderFeature().find(); final Path file = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path symlinkRelative = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file, AbstractPath.Type.symboliclink)); @@ -100,7 +100,7 @@ public class LocalListServiceTest { assertTrue(list.get(symlinkRelative).getSymlinkTarget().getAbsolute().endsWith(file.getName())); assertTrue(list.contains(symlinkAbsolute)); assertTrue(list.get(symlinkAbsolute).getSymlinkTarget().getAbsolute().endsWith(file.getAbsolute())); - new LocalDeleteFeature(session).delete(Arrays.asList(file, symlinkAbsolute, symlinkRelative), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Arrays.asList(file, symlinkAbsolute, symlinkRelative), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } @@ -108,10 +108,10 @@ public class LocalListServiceTest { public void testListJunction() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); assumeTrue(Factory.Platform.getDefault().equals(Factory.Platform.Name.windows)); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new LocalHomeFinderFeature().find(); final AttributedList list = new LocalListService(session).list(home, new DisabledListProgressListener()); assertTrue(list.contains(new Path(home, "Recent", EnumSet.of(Path.Type.directory)))); @@ -131,8 +131,8 @@ public class LocalListServiceTest { @Test(expected = NotfoundException.class) public void testListNotfound() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path f = new Path(UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final LocalListService service = new LocalListService(session); service.list(f, new DisabledListProgressListener()); @@ -141,8 +141,8 @@ public class LocalListServiceTest { @Test(expected = NotfoundException.class) public void testListFile() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new LocalHomeFinderFeature().find(); final LocalListService service = new LocalListService(session); service.list(new Path(home, "test", EnumSet.of(Path.Type.directory)), new DisabledListProgressListener()); diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalMoveFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalMoveFeatureTest.java index 9d7206af9f..66224e582d 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalMoveFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalMoveFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.nio; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -42,8 +42,8 @@ public class LocalMoveFeatureTest { @Test public void testMoveFile() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), test, new TransferStatus()); @@ -51,14 +51,14 @@ public class LocalMoveFeatureTest { new LocalMoveFeature(session).move(test, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new LocalFindFeature(session).find(test)); assertTrue(new LocalFindFeature(session).find(target)); - new LocalDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testMoveDirectory() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalDirectoryFeature(session).mkdir(new LocalWriteFeature(session), test, new TransferStatus()); @@ -66,14 +66,14 @@ public class LocalMoveFeatureTest { new LocalMoveFeature(session).move(test, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new LocalFindFeature(session).find(test)); assertTrue(new LocalFindFeature(session).find(target)); - new LocalDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testRenameCaseOnly() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, StringUtils.lowerCase(new AsciiRandomStringService().random()), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), test, new TransferStatus()); @@ -81,14 +81,14 @@ public class LocalMoveFeatureTest { new LocalMoveFeature(session).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new LocalFindFeature(session).find(test)); assertTrue(new LocalFindFeature(session).find(target)); - new LocalDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testMoveOverride() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), test, new TransferStatus()); @@ -97,14 +97,14 @@ public class LocalMoveFeatureTest { new LocalMoveFeature(session).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new LocalFindFeature(session).find(test)); assertTrue(new LocalFindFeature(session).find(target)); - new LocalDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) public void testMoveNotFound() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalMoveFeature(session).move(test, new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)), new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalQuotaFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalQuotaFeatureTest.java index 017d576e91..1b80b2f39a 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalQuotaFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalQuotaFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.nio; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.features.Quota; import ch.cyberduck.core.proxy.DisabledProxyFinder; import ch.cyberduck.core.threading.CancelCallback; @@ -32,8 +32,8 @@ public class LocalQuotaFeatureTest { @Test public void get() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Quota.Space quota = new LocalQuotaFeature(session).get(); assertNotNull(quota.used); assertNotNull(quota.available); diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalReadFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalReadFeatureTest.java index 99af7ec174..98aeb3f914 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalReadFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalReadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.nio; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -46,8 +46,8 @@ public class LocalReadFeatureTest { @Test(expected = NotfoundException.class) public void testReadNotFound() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final TransferStatus status = new TransferStatus(); final Path workdir = new LocalHomeFinderFeature().find(); new LocalReadFeature(session).read(new Path(workdir, "nosuchname", EnumSet.of(Path.Type.file)), status, ConnectionCallback.noop); @@ -56,8 +56,8 @@ public class LocalReadFeatureTest { @Test public void testRead() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), test, new TransferStatus()); @@ -80,15 +80,15 @@ public class LocalReadFeatureTest { in.close(); assertArrayEquals(content, buffer.toByteArray()); } - new LocalDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } @Test public void testReadRange() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), test, new TransferStatus()); @@ -115,7 +115,7 @@ public class LocalReadFeatureTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); } - new LocalDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalSessionTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalSessionTest.java index 13fd12c900..579af4847a 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalSessionTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalSessionTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.nio; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.proxy.DisabledProxyFinder; import ch.cyberduck.core.threading.CancelCallback; @@ -31,7 +31,7 @@ public class LocalSessionTest { @Test public void toPath() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); assertNotNull(session.toPath("/Users/username")); assertNotNull(session.toPath("/C:\\Users\\Administrator")); assertEquals("C:\\Users\\Administrator", "/C:\\Users\\Administrator".replaceFirst("^/(.:[/\\\\])", "$1")); diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalSymlinkFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalSymlinkFeatureTest.java index 5e1267a74b..251be2cce6 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalSymlinkFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalSymlinkFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.nio; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.proxy.DisabledProxyFinder; @@ -41,8 +41,8 @@ public class LocalSymlinkFeatureTest { public void testSymlink() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); assumeTrue(session.isPosixFilesystem()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path target = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), target, new TransferStatus()); @@ -51,10 +51,10 @@ public class LocalSymlinkFeatureTest { assertTrue(new LocalFindFeature(session).find(link)); assertEquals(EnumSet.of(Path.Type.file, AbstractPath.Type.symboliclink), new LocalListService(session).list(workdir, new DisabledListProgressListener()).get(link).getType()); - new LocalDeleteFeature(session).delete(Collections.singletonList(link), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(link), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new LocalFindFeature(session).find(link)); assertTrue(new LocalFindFeature(session).find(target)); - new LocalDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalTouchFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalTouchFeatureTest.java index beb81d4095..35c34a1d0e 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalTouchFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalTouchFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.nio; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.proxy.DisabledProxyFinder; @@ -40,10 +40,10 @@ public class LocalTouchFeatureTest { @Test public void testTouch() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), test, new TransferStatus()); @@ -52,7 +52,7 @@ public class LocalTouchFeatureTest { assertTrue(new LocalFindFeature(session).find(test)); final AttributedList list = new LocalListService(session).list(workdir, new DisabledListProgressListener()); assertTrue(list.contains(test)); - new LocalDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalUnixPermissionFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalUnixPermissionFeatureTest.java index b2c62a895c..c22996a839 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalUnixPermissionFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalUnixPermissionFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.nio; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Permission; import ch.cyberduck.core.features.Delete; @@ -40,24 +40,24 @@ public class LocalUnixPermissionFeatureTest { public void testSetUnixPermission() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); if(session.isPosixFilesystem()) { - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); { final Path file = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), file, new TransferStatus()); new LocalUnixPermissionFeature(session).setUnixPermission(file, new Permission(666)); assertEquals("666", new LocalListService(session).list(workdir, new DisabledListProgressListener()).get(file).attributes().getPermission().getMode()); - new LocalDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } { final Path directory = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new LocalDirectoryFeature(session).mkdir(new LocalWriteFeature(session), directory, new TransferStatus()); new LocalUnixPermissionFeature(session).setUnixPermission(directory, new Permission(666)); assertEquals("666", new LocalListService(session).list(workdir, new DisabledListProgressListener()).get(directory).attributes().getPermission().getMode()); - new LocalDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } session.close(); } diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalUploadFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalUploadFeatureTest.java index ab6bef9d02..b891631db6 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalUploadFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalUploadFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.nio; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.proxy.DisabledProxyFinder; @@ -37,12 +37,12 @@ public class LocalUploadFeatureTest { @Test public void testAppend() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), test, new TransferStatus()); assertTrue(new LocalUploadFeature(session).append(test, new TransferStatus().setExists(true).setLength(0L).setRemote(new LocalAttributesFinderFeature(session).find(test))).append); - new LocalDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/nio/src/test/java/ch/cyberduck/core/nio/LocalWriteFeatureTest.java b/nio/src/test/java/ch/cyberduck/core/nio/LocalWriteFeatureTest.java index 678aa5f077..45d61f7767 100644 --- a/nio/src/test/java/ch/cyberduck/core/nio/LocalWriteFeatureTest.java +++ b/nio/src/test/java/ch/cyberduck/core/nio/LocalWriteFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -54,8 +54,8 @@ public class LocalWriteFeatureTest { public void testWriteSymlink() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); if(session.isPosixFilesystem()) { - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path target = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalTouchFeature(session).touch(new LocalWriteFeature(session), target, new TransferStatus()); @@ -88,15 +88,15 @@ public class LocalWriteFeatureTest { final AttributedList list = new LocalListService(session).list(workdir, new DisabledListProgressListener()); assertTrue(list.contains(new Path(workdir, name, EnumSet.of(Path.Type.file)))); assertFalse(list.contains(symlink)); - new LocalDeleteFeature(session).delete(Arrays.asList(target, symlink), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Arrays.asList(target, symlink), LoginCallback.noop, new Delete.DisabledCallback()); } } @Test(expected = NotfoundException.class) public void testWriteNotFound() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir.getAbsolute() + "/nosuchdirectory/" + UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new LocalWriteFeature(session).write(test, new TransferStatus(), ConnectionCallback.noop); @@ -105,8 +105,8 @@ public class LocalWriteFeatureTest { @Test public void testWriteContentRange() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final LocalWriteFeature feature = new LocalWriteFeature(session); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); @@ -137,14 +137,14 @@ public class LocalWriteFeatureTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); IOUtils.copy(new LocalReadFeature(session).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out); assertArrayEquals(content, out.toByteArray()); - new LocalDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testWriteRangeEndFirst() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final LocalWriteFeature feature = new LocalWriteFeature(session); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); @@ -178,14 +178,14 @@ public class LocalWriteFeatureTest { assertArrayEquals(content, out.toByteArray()); assertTrue(new DefaultFindFeature(session).find(test)); assertEquals(content.length, new DefaultAttributesFinderFeature(session).find(test).getSize()); - new LocalDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testWriteTildeFilename() throws Exception { final LocalSession session = new LocalSession(new Host(new LocalProtocol(), new LocalProtocol().getDefaultHostname())); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final LocalWriteFeature feature = new LocalWriteFeature(session); final Path workdir = new LocalHomeFinderFeature().find(); final Path test = new Path(workdir, String.format("~$%s", new AsciiRandomStringService().random()), EnumSet.of(Path.Type.file)); @@ -200,6 +200,6 @@ public class LocalWriteFeatureTest { assertArrayEquals(content, b.toByteArray()); assertTrue(new DefaultFindFeature(session).find(test)); assertEquals(content.length, new DefaultAttributesFinderFeature(session).find(test).getSize()); - new LocalDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new LocalDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index f4374e6141..6cce366299 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -94,7 +94,7 @@ public class CopyWorkerTest extends AbstractOneDriveTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new GraphReadFeature(session, fileid), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); session.close(); } @@ -119,7 +119,7 @@ public class CopyWorkerTest extends AbstractOneDriveTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -144,7 +144,7 @@ public class CopyWorkerTest extends AbstractOneDriveTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -175,7 +175,7 @@ public class CopyWorkerTest extends AbstractOneDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new GraphFindFeature(session, fileid)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -206,7 +206,7 @@ public class CopyWorkerTest extends AbstractOneDriveTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); IOUtils.copy(new CryptoReadFeature(session, new GraphReadFeature(session, fileid), cryptomator).read(encryptedFile, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -234,7 +234,7 @@ public class CopyWorkerTest extends AbstractOneDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new GraphFindFeature(session, fileid).find(cleartextFolder)); assertTrue(new GraphFindFeature(session, fileid).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -262,7 +262,7 @@ public class CopyWorkerTest extends AbstractOneDriveTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new GraphFindFeature(session, fileid)).find(encryptedFile)); assertTrue(new GraphFindFeature(session, fileid).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); registry.clear(); } @@ -291,7 +291,7 @@ public class CopyWorkerTest extends AbstractOneDriveTest { assertTrue(new GraphFindFeature(session, fileid).find(cleartextFolder)); final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new GraphFindFeature(session, fileid).find(fileRenamed)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); registry.clear(); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoOneDriveSingleTransferWorkerTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoOneDriveSingleTransferWorkerTest.java index 54e51e267f..99a9e03cc6 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoOneDriveSingleTransferWorkerTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoOneDriveSingleTransferWorkerTest.java @@ -17,10 +17,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -101,7 +101,7 @@ public class CryptoOneDriveSingleTransferWorkerTest extends AbstractOneDriveTest return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertTrue(cryptomator.getFeature(session, Find.class, new GraphFindFeature(session, fileid)).find(dir1)); @@ -119,7 +119,7 @@ public class CryptoOneDriveSingleTransferWorkerTest extends AbstractOneDriveTest new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphDirectoryFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphDirectoryFeatureTest.java index 07ff8886a6..66e491df04 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphDirectoryFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphDirectoryFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -76,10 +76,10 @@ public class GraphDirectoryFeatureTest extends AbstractOneDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); assertEquals(id, cryptomator.getFeature(session, AttributesFinder.class, new GraphAttributesFinderFeature(session, fileid)).find(test).getFileId()); assertEquals(id, cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session)).find(test).getFileId()); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new CryptoListService(session, new GraphItemListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()) .toStream().filter(f -> !f.attributes().isDuplicate()).collect(Collectors.toList()).isEmpty()); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -97,6 +97,6 @@ public class GraphDirectoryFeatureTest extends AbstractOneDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new GraphAttributesFinderFeature(session, fileid)).find(test); assertEquals(id, attributes.getFileId()); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphMoveFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphMoveFeatureTest.java index 6e453e3d3c..216e64067c 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphMoveFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphMoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.features.AttributesFinder; @@ -87,6 +87,6 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new GraphFindFeature(session, fileid)).find(fileRenamedInRenamedFolder)); cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList( - fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphTouchFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphTouchFeatureTest.java index e63808cfa5..34f3b47b68 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphTouchFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphTouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; @@ -71,7 +71,7 @@ public class GraphTouchFeatureTest extends AbstractOneDriveTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new GraphAttributesFinderFeature(session, fileid)).find(test); assertNotNull(attributes.getFileId()); assertEquals(test.attributes(), attributes); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,6 +91,6 @@ public class GraphTouchFeatureTest extends AbstractOneDriveTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new GraphAttributesFinderFeature(session, fileid)).find(test); assertNotNull(attributes.getFileId()); assertEquals(test.attributes(), attributes); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphWriteFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphWriteFeatureTest.java index 65a48d99b7..69feaa544c 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphWriteFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -91,6 +91,6 @@ public class GraphWriteFeatureTest extends AbstractOneDriveTest { final InputStream in = new CryptoReadFeature(session, new GraphReadFeature(session, fileid), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index d00eb2268d..13eccc32b2 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -90,14 +90,14 @@ public class MoveWorkerTest extends AbstractOneDriveTest { new CryptoBulkFeature<>(session, new DisabledBulkFeature(), cryptomator).pre(Transfer.Type.upload, Collections.singletonMap(new TransferItem(source), status), ConnectionCallback.noop); new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(new ByteArrayInputStream(content), new CryptoWriteFeature<>(session, new GraphWriteFeature(session, fileid), cryptomator).write(source, status.setLength(content.length), ConnectionCallback.noop)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new GraphReadFeature(session, fileid), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(target, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(target, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -116,11 +116,11 @@ public class MoveWorkerTest extends AbstractOneDriveTest { cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -140,11 +140,11 @@ public class MoveWorkerTest extends AbstractOneDriveTest { cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -164,18 +164,18 @@ public class MoveWorkerTest extends AbstractOneDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); // rename file final Path fileRenamed = new Path(folder, "f1", EnumSet.of(Path.Type.file)); - new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamed)); // rename folder final Path folderRenamed = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(folder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(folderRenamed)); assertEquals(1, new CryptoListService(session, new GraphItemListService(session, fileid), cryptomator).list(folderRenamed, new DisabledListProgressListener()).size()); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -195,11 +195,11 @@ public class MoveWorkerTest extends AbstractOneDriveTest { cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), encryptedFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); // move file into vault - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(new DefaultFindFeature(session).find(clearFile)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -221,13 +221,13 @@ public class MoveWorkerTest extends AbstractOneDriveTest { // move directory into vault final Path encryptedFolder = new Path(vault, clearFolder.getName(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, clearFile.getName(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertFalse(new DefaultFindFeature(session).find(clearFolder)); assertThrows(NotfoundException.class, () -> new DefaultFindFeature(session).find(clearFile)); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -253,12 +253,12 @@ public class MoveWorkerTest extends AbstractOneDriveTest { assertEquals(0L, cryptomator.getFeature(session, AttributesFinder.class, new GraphAttributesFinderFeature(session, fileid)).find(encryptedFile).getSize()); // move file outside vault final Path fileRenamed = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new GraphDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, clearFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, clearFolder), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -280,15 +280,15 @@ public class MoveWorkerTest extends AbstractOneDriveTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move directory outside vault final Path directoryRenamed = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertThrows(NotfoundException.class, () -> cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DefaultFindFeature(session).find(directoryRenamed)); final Path fileRenamed = new Path(directoryRenamed, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new DefaultFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new GraphDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, directoryRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Arrays.asList(fileRenamed, directoryRenamed), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/OneDriveListServiceTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/OneDriveListServiceTest.java index b7a15b186e..27bb4a12a5 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/OneDriveListServiceTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/OneDriveListServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -64,6 +64,6 @@ public class OneDriveListServiceTest extends AbstractOneDriveTest { new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), test, new TransferStatus()); assertEquals(new SimplePathPredicate(test), new SimplePathPredicate(new CryptoListService(session, new GraphItemListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()).get(0))); - cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new GraphDeleteFeature(session, fileid)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/BufferWriteFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/BufferWriteFeatureTest.java index dd133cc29a..8b15b365a5 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/BufferWriteFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/BufferWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.StatusOutputStream; @@ -67,7 +67,7 @@ public class BufferWriteFeatureTest extends AbstractOneDriveTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -105,7 +105,7 @@ public class BufferWriteFeatureTest extends AbstractOneDriveTest { stream.close(); assertArrayEquals(content, compare); } - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -126,7 +126,7 @@ public class BufferWriteFeatureTest extends AbstractOneDriveTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -147,6 +147,6 @@ public class BufferWriteFeatureTest extends AbstractOneDriveTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphAttributesFinderFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphAttributesFinderFeatureTest.java index bcbe44205e..92715216bc 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphAttributesFinderFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphAttributesFinderFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.onedrive; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -67,7 +67,7 @@ public class GraphAttributesFinderFeatureTest extends AbstractOneDriveTest { assertNotNull(attributes.getVersionId()); assertNotNull(attributes.getLink()); assertNotNull(attributes.getFileId()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -83,7 +83,7 @@ public class GraphAttributesFinderFeatureTest extends AbstractOneDriveTest { assertNull(attributes.getVersionId()); assertNotNull(attributes.getLink()); assertNotNull(attributes.getFileId()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -92,13 +92,13 @@ public class GraphAttributesFinderFeatureTest extends AbstractOneDriveTest { final Path drive = new OneDriveHomeFinderService().find(); final Path test = new GraphTouchFeature(session, fileid).touch(new GraphWriteFeature(session, fileid), new Path(drive, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final String previousnodeid = test.attributes().getFileId(); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); final String latestnodeid = new GraphTouchFeature(session, fileid).touch(new GraphWriteFeature(session, fileid), new Path(drive, test.getName(), EnumSet.of(Path.Type.file)), new TransferStatus()).attributes().getFileId(); assertNotNull(latestnodeid); // Assume previously seen but changed on server fileid.cache(test, previousnodeid); final GraphAttributesFinderFeature f = new GraphAttributesFinderFeature(session, fileid); assertEquals(latestnodeid, f.find(test).getFileId()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphCopyFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphCopyFeatureTest.java index 8be267c6a6..efdca503a8 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphCopyFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphCopyFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -54,7 +54,7 @@ public class GraphCopyFeatureTest extends AbstractOneDriveTest { final Path drive = new OneDriveHomeFinderService().find(); final Path file = touch.touch(new GraphWriteFeature(session, fileid), new Path(drive, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus().setMime("x-application/cyberduck")); final String fileid = file.attributes().getFileId(); - delete.delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); final Path target = new Path(drive, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); assertThrows(NotfoundException.class, () -> new GraphCopyFeature(session, this.fileid).copy(file, target, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop)); file.attributes().setFileId(fileid); @@ -76,7 +76,7 @@ public class GraphCopyFeatureTest extends AbstractOneDriveTest { final Path target = copy.copy(file, rename, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertNotEquals(file.attributes().getFileId(), target.attributes().getFileId()); assertEquals(target.attributes().getFileId(), new GraphAttributesFinderFeature(session, fileid).find(rename).getFileId()); - new GraphDeleteFeature(session, fileid).delete(Arrays.asList(file, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Arrays.asList(file, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -89,6 +89,6 @@ public class GraphCopyFeatureTest extends AbstractOneDriveTest { final Find find = new GraphFindFeature(session, fileid); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new GraphDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphDeleteFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphDeleteFeatureTest.java index 88d02ba553..8ee20a2cfe 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphDeleteFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphDeleteFeatureTest.java @@ -15,7 +15,7 @@ package ch.cyberduck.core.onedrive; * GNU General Public License for more details. */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -38,7 +38,7 @@ public class GraphDeleteFeatureTest extends AbstractOneDriveTest { public void testDeleteNotFound() throws Exception { final Path test = new Path(new OneDriveHomeFinderService().find(), "t", EnumSet.of(Path.Type.file)); try { - new GraphDeleteFeature(session, new GraphFileIdProvider(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, new GraphFileIdProvider(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } catch(NotfoundException e) { assertEquals("File not found", e.getMessage()); diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphDirectoryFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphDirectoryFeatureTest.java index ac33ff1249..bedda2d635 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphDirectoryFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphDirectoryFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.RandomStringService; @@ -51,7 +51,7 @@ public class GraphDirectoryFeatureTest extends AbstractOneDriveTest { assertEquals(target.attributes().getFileId(), attributes.getFileId()); assertEquals(target.attributes().getModificationDate(), attributes.getModificationDate()); assertThrows(ConflictException.class, () -> new GraphDirectoryFeature(session, fileid).mkdir(new GraphWriteFeature(session, fileid), target, new TransferStatus())); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -63,6 +63,6 @@ public class GraphDirectoryFeatureTest extends AbstractOneDriveTest { final AttributedList list = new GraphItemListService(session, fileid).list(new OneDriveHomeFinderService().find(), new DisabledListProgressListener()); assertTrue(list.contains(target)); assertNotNull(new GraphAttributesFinderFeature(session, fileid).find(target).getETag()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphFileIdProviderTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphFileIdProviderTest.java index 460f7c2c18..bf8b2e6e94 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphFileIdProviderTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphFileIdProviderTest.java @@ -1,8 +1,8 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -83,6 +83,6 @@ public class GraphFileIdProviderTest extends AbstractOneDriveTest { catch(NotfoundException e) { // Expected } - new GraphDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphFindFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphFindFeatureTest.java index 1f77ab026d..5cfd3c7741 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphFindFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.onedrive; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.onedrive.features.GraphDeleteFeature; @@ -46,7 +46,7 @@ public class GraphFindFeatureTest extends AbstractOneDriveTest { new GraphWriteFeature(session, fileid), new Path(new OneDriveHomeFinderService().find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new GraphFindFeature(session, fileid).find(folder)); assertFalse(new GraphFindFeature(session, fileid).find(new Path(folder.getAbsolute(), EnumSet.of(Path.Type.file)))); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -55,7 +55,7 @@ public class GraphFindFeatureTest extends AbstractOneDriveTest { new GraphTouchFeature(session, fileid).touch(new GraphWriteFeature(session, fileid), file, new TransferStatus()); assertTrue(new GraphFindFeature(session, fileid).find(file)); assertFalse(new GraphFindFeature(session, fileid).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphItemListServiceTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphItemListServiceTest.java index 631bbe62e8..af148dcda5 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphItemListServiceTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphItemListServiceTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.RandomStringService; @@ -85,7 +85,7 @@ public class GraphItemListServiceTest extends AbstractOneDriveTest { assertNotNull(attributes.getFileId()); assertNotNull(attributes.getLink()); } - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -93,6 +93,6 @@ public class GraphItemListServiceTest extends AbstractOneDriveTest { final RandomStringService randomStringService = new AlphanumericRandomStringService(); final Path target = new GraphDirectoryFeature(session, fileid).mkdir(new GraphWriteFeature(session, fileid), new Path(new OneDriveHomeFinderService().find(), String.format("%s %s", randomStringService.random(), randomStringService.random()), EnumSet.of(Path.Type.directory)), null); final AttributedList list = new GraphItemListService(session, fileid).list(target, new DisabledListProgressListener()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphLockFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphLockFeatureTest.java index 5092ac5eb2..d39781242e 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphLockFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphLockFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -67,6 +67,6 @@ public class GraphLockFeatureTest extends AbstractSharepointTest { assertNotEquals(attr.getModificationDate(), latest.getModificationDate()); assertNotEquals(attr.getETag(), latest.getETag()); } - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphMoveFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphMoveFeatureTest.java index a735e0254e..a2c7c72253 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphMoveFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphMoveFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.BackgroundException; @@ -60,7 +60,7 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { final Path drive = new OneDriveHomeFinderService().find(); final Path file = touch.touch(new GraphWriteFeature(session, fileid), new Path(drive, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus().setMime("x-application/cyberduck")); final String fileid = file.attributes().getFileId(); - delete.delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); final Path target = new Path(drive, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); assertThrows(NotfoundException.class, () -> new GraphMoveFeature(session, this.fileid).move(file, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop)); file.attributes().setFileId(fileid); @@ -89,7 +89,7 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { assertEquals(attributes.getVersionId(), target.attributes().getVersionId()); assertNotEquals(attributes.getETag(), attributesFinder.find(rename).getETag()); assertEquals(target.attributes().getETag(), attributesFinder.find(rename).getETag()); - delete.delete(Collections.singletonList(rename), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(rename), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -121,7 +121,7 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { assertEquals(attributes.getVersionId(), renamedAttributes.getVersionId()); assertEquals(target.attributes().getETag(), renamedAttributes.getETag()); - delete.delete(Collections.singletonList(targetDirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(targetDirectory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -145,8 +145,8 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { move.move(touchedFile, rename, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertNotNull(attributesFinder.find(rename)); - delete.delete(Collections.singletonList(targetDirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); - delete.delete(Collections.singletonList(rename), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(targetDirectory), LoginCallback.noop, new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(rename), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -170,7 +170,7 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { move.move(touchedFile, rename, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertNotNull(attributesFinder.find(rename)); - delete.delete(Collections.singletonList(targetDirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(targetDirectory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -184,7 +184,7 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { assertEquals(1, files.size()); assertFalse(find.find(temp)); assertTrue(find.find(test)); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -194,6 +194,6 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { final Path file = new GraphTouchFeature(session, fileid).touch(new GraphWriteFeature(session, fileid), new Path(home, StringUtils.capitalize(name), EnumSet.of(Path.Type.file)), new TransferStatus()); final Path rename = new Path(home, StringUtils.lowerCase(name), EnumSet.of(Path.Type.file)); new GraphMoveFeature(session, fileid).move(file, rename, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(rename), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(rename), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphReadFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphReadFeatureTest.java index 620885bd14..b422b408f6 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphReadFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphReadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.exception.NotfoundException; @@ -76,7 +76,7 @@ public class GraphReadFeatureTest extends AbstractOneDriveTest { assertNotNull(in); in.close(); } - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -109,7 +109,7 @@ public class GraphReadFeatureTest extends AbstractOneDriveTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -150,6 +150,6 @@ public class GraphReadFeatureTest extends AbstractOneDriveTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphShareTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphShareTest.java index 731b0468c5..0c04884b65 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphShareTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphShareTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DescriptiveUrl; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Share; @@ -45,6 +45,6 @@ public class GraphShareTest extends AbstractOneDriveTest { final Path file = new Path(new OneDriveHomeFinderService().find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new GraphTouchFeature(session, fileid).touch(new GraphWriteFeature(session, fileid), file, new TransferStatus().setMime("x-application/cyberduck")); assertNotEquals(DescriptiveUrl.EMPTY, new GraphSharedLinkFeature(session, fileid).toDownloadUrl(file, Share.Sharee.world, null, new DisabledPasswordCallback())); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphTimestampFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphTimestampFeatureTest.java index b5c09ee428..16877af745 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphTimestampFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphTimestampFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.onedrive; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -30,11 +30,12 @@ import ch.cyberduck.test.IntegrationTest; import org.junit.Test; import org.junit.experimental.categories.Category; -import static org.junit.Assert.assertEquals; import java.util.Collections; import java.util.EnumSet; +import static org.junit.Assert.assertEquals; + @Category(IntegrationTest.class) public class GraphTimestampFeatureTest extends AbstractOneDriveTest { @@ -48,6 +49,6 @@ public class GraphTimestampFeatureTest extends AbstractOneDriveTest { assertEquals(1671187993000L, status.getResponse().getModificationDate()); final PathAttributes attr = new GraphAttributesFinderFeature(session, fileid).find(test); assertEquals(1671187993000L, attr.getModificationDate()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphTouchFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphTouchFeatureTest.java index 0b4bb47ff3..90946490f2 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphTouchFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphTouchFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.RandomStringService; @@ -58,7 +58,7 @@ public class GraphTouchFeatureTest extends AbstractOneDriveTest { final PathAttributes attr = new GraphAttributesFinderFeature(session, fileid).find(file); assertEquals(file.attributes().getFileId(), attr.getFileId()); assertEquals(file.attributes().getVersionId(), attr.getVersionId()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -66,7 +66,7 @@ public class GraphTouchFeatureTest extends AbstractOneDriveTest { final Path file = new Path(new OneDriveHomeFinderService().find(), String.format("%sä", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)); new GraphTouchFeature(session, fileid).touch(new GraphWriteFeature(session, fileid), file, new TransferStatus()); assertNotNull(new GraphAttributesFinderFeature(session, fileid).find(file)); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -74,7 +74,7 @@ public class GraphTouchFeatureTest extends AbstractOneDriveTest { final Path file = new Path(new OneDriveHomeFinderService().find(), String.format("%s====", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)); new GraphTouchFeature(session, fileid).touch(new GraphWriteFeature(session, fileid), file, new TransferStatus()); assertNotNull(new GraphAttributesFinderFeature(session, fileid).find(file)); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -83,7 +83,7 @@ public class GraphTouchFeatureTest extends AbstractOneDriveTest { final Path file = new Path(new OneDriveHomeFinderService().find(), String.format("%s %s", randomStringService.random(), randomStringService.random()), EnumSet.of(Path.Type.file)); new GraphTouchFeature(session, fileid).touch(new GraphWriteFeature(session, fileid), file, new TransferStatus().setMime("x-application/cyberduck")); assertNotNull(new GraphAttributesFinderFeature(session, fileid).find(file)); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveTimestampFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveTimestampFeatureTest.java index 783587c72b..3d4094eafd 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveTimestampFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveTimestampFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -61,7 +61,7 @@ public class OneDriveTimestampFeatureTest extends AbstractOneDriveTest { assertNotEquals(attr.getETag(), updated.getETag()); assertEquals(Timestamp.toSeconds(modified), new DefaultAttributesFinderFeature(session).find(file).getModificationDate()); assertEquals(Timestamp.toSeconds(modified), Timestamp.toSeconds(new GraphItemListService(session, fileid).list(drive, new DisabledListProgressListener()).find(new SimplePathPredicate(file)).attributes().getModificationDate())); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -79,6 +79,6 @@ public class OneDriveTimestampFeatureTest extends AbstractOneDriveTest { assertEquals(Timestamp.toSeconds(modified), Timestamp.toSeconds(updated.getModificationDate())); assertNotEquals(attr.getETag(), updated.getETag()); assertEquals(Timestamp.toSeconds(modified), Timestamp.toSeconds(new GraphItemListService(session, fileid).list(drive, new DisabledListProgressListener()).find(new SimplePathPredicate(test)).attributes().getModificationDate())); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveWriteFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveWriteFeatureTest.java index d45e72c8ea..365aab33dd 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveWriteFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultIOExceptionMappingService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.Protocol; @@ -92,7 +92,7 @@ public class OneDriveWriteFeatureTest extends AbstractOneDriveTest { assertEquals(content.length, IOUtils.copyLarge(new ByteArrayInputStream(content), overwrite)); overwrite.close(); assertEquals(new GraphAttributesFinderFeature(session, fileid).toAttributes(overwrite.getStatus()), new GraphAttributesFinderFeature(session, fileid).find(file)); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,7 +115,7 @@ public class OneDriveWriteFeatureTest extends AbstractOneDriveTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -138,7 +138,7 @@ public class OneDriveWriteFeatureTest extends AbstractOneDriveTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -161,7 +161,7 @@ public class OneDriveWriteFeatureTest extends AbstractOneDriveTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -184,7 +184,7 @@ public class OneDriveWriteFeatureTest extends AbstractOneDriveTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/SharepointTimestampFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/SharepointTimestampFeatureTest.java index 7588ca4904..8b9ca1ba7f 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/SharepointTimestampFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/SharepointTimestampFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -64,7 +64,7 @@ public class SharepointTimestampFeatureTest extends AbstractSharepointTest { assertNotEquals(attr.getETag(), updated.getETag()); assertEquals(modified, new DefaultAttributesFinderFeature(session).find(file).getModificationDate()); assertEquals(modified, new GraphItemListService(session, fileid).list(drive, new DisabledListProgressListener()).find(new SimplePathPredicate(file)).attributes().getModificationDate()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -82,6 +82,6 @@ public class SharepointTimestampFeatureTest extends AbstractSharepointTest { assertEquals(modified, updated.getModificationDate()); assertNotEquals(attr.getETag(), updated.getETag()); assertEquals(modified, new GraphItemListService(session, fileid).list(drive, new DisabledListProgressListener()).find(new SimplePathPredicate(test)).attributes().getModificationDate()); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/SharepointWriteFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/SharepointWriteFeatureTest.java index 406d18c3ea..3425e0bb5f 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/SharepointWriteFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/SharepointWriteFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.Protocol; @@ -92,6 +92,6 @@ public class SharepointWriteFeatureTest extends AbstractSharepointTest { assertEquals(content.length, IOUtils.copyLarge(new ByteArrayInputStream(content), overwrite)); overwrite.close(); assertEquals(new GraphAttributesFinderFeature(session, fileid).toAttributes(overwrite.getStatus()), new GraphAttributesFinderFeature(session, fileid).find(file)); - new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationLoader.java b/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationLoader.java index 414ba5cddf..26ac79de46 100644 --- a/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationLoader.java +++ b/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationLoader.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.PasswordCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cdn.Distribution; @@ -58,7 +58,7 @@ public class SwiftDistributionConfigurationLoader extends OneTimeSchedulerFeatur final Map> distributions = new HashMap<>(); for(Path container : containers) { for(Distribution.Method method : feature.getMethods(container)) { - final Distribution distribution = feature.read(container, method, new DisabledLoginCallback()); + final Distribution distribution = feature.read(container, method, LoginCallback.noop); log.info("Cache distribution {}", distribution); distributions.getOrDefault(container, new HashSet<>()).add(distribution); } diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index d0d3d6fd6e..a2daa60d9b 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -94,7 +94,7 @@ public class CopyWorkerTest extends AbstractSwiftTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new SwiftReadFeature(session, new SwiftRegionService(session)), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -118,7 +118,7 @@ public class CopyWorkerTest extends AbstractSwiftTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -143,7 +143,7 @@ public class CopyWorkerTest extends AbstractSwiftTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -174,7 +174,7 @@ public class CopyWorkerTest extends AbstractSwiftTest { assertTrue(cryptomator.getFeature(session, Find.class, new SwiftFindFeature(session)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -204,7 +204,7 @@ public class CopyWorkerTest extends AbstractSwiftTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new SwiftReadFeature(session, new SwiftRegionService(session)), cryptomator).read(encryptedFile, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -231,7 +231,7 @@ public class CopyWorkerTest extends AbstractSwiftTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new SwiftFindFeature(session).find(cleartextFolder)); assertTrue(new SwiftFindFeature(session).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -259,7 +259,7 @@ public class CopyWorkerTest extends AbstractSwiftTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new SwiftFindFeature(session)).find(encryptedFile)); assertTrue(new SwiftFindFeature(session).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); registry.clear(); } @@ -288,7 +288,7 @@ public class CopyWorkerTest extends AbstractSwiftTest { assertTrue(new SwiftFindFeature(session).find(cleartextFolder)); final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new SwiftFindFeature(session).find(fileRenamed)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); registry.clear(); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/CryptoSwiftSingleTransferWorkerTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/CryptoSwiftSingleTransferWorkerTest.java index 6ba3386734..ab48071f06 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/CryptoSwiftSingleTransferWorkerTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/CryptoSwiftSingleTransferWorkerTest.java @@ -17,10 +17,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -101,7 +101,7 @@ public class CryptoSwiftSingleTransferWorkerTest extends AbstractSwiftTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertTrue(cryptomator.getFeature(session, Find.class, new SwiftFindFeature(session)).find(dir1)); @@ -119,7 +119,7 @@ public class CryptoSwiftSingleTransferWorkerTest extends AbstractSwiftTest { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftDirectoryFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftDirectoryFeatureTest.java index 16a9a6f021..35c69263e5 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftDirectoryFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftDirectoryFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Directory; @@ -60,7 +60,7 @@ public class SwiftDirectoryFeatureTest extends AbstractSwiftTest { cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SwiftWriteFeature(session, new SwiftRegionService(session))), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -75,6 +75,6 @@ public class SwiftDirectoryFeatureTest extends AbstractSwiftTest { cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SwiftWriteFeature(session, new SwiftRegionService(session))), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeObjectUploadFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeObjectUploadFeatureTest.java index 76fed5bccf..056f3a7142 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeObjectUploadFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeObjectUploadFeatureTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -100,7 +100,7 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { final InputStream in = new CryptoReadFeature(session, new SwiftReadFeature(session, regionService), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeUploadWriteFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeUploadWriteFeatureTest.java index 7a7c26723d..f8979431b5 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeUploadWriteFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeUploadWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -89,6 +89,6 @@ public class SwiftLargeUploadWriteFeatureTest extends AbstractSwiftTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftListServiceTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftListServiceTest.java index eb7c9e2507..79f9677364 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftListServiceTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftListServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; @@ -66,6 +66,6 @@ public class SwiftListServiceTest extends AbstractSwiftTest { new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new SwiftWriteFeature(session, regionService), cryptomator), test, new TransferStatus()); assertEquals(test, new CryptoListService(session, new SwiftObjectListService(session), cryptomator).list(vault, new DisabledListProgressListener()).get(0)); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftMoveFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftMoveFeatureTest.java index d08b88dd77..f98e914fb5 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftMoveFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftMoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.features.Delete; @@ -83,6 +83,6 @@ public class SwiftMoveFeatureTest extends AbstractSwiftTest { assertTrue(cryptomator.getFeature(session, Find.class, new SwiftFindFeature(session)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new SwiftFindFeature(session)).find(fileRenamedInRenamedFolder)); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftTouchFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftTouchFeatureTest.java index b1e15592ec..25b94bb05b 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftTouchFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftTouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -69,7 +69,7 @@ public class SwiftTouchFeatureTest extends AbstractSwiftTest { assertEquals(0L, test.attributes().getSize()); assertEquals(0L, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new SwiftFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -86,6 +86,6 @@ public class SwiftTouchFeatureTest extends AbstractSwiftTest { assertEquals(0L, test.attributes().getSize()); assertEquals(0L, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftWriteFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftWriteFeatureTest.java index 28995bf755..696fec0e65 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftWriteFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -92,6 +92,6 @@ public class SwiftWriteFeatureTest extends AbstractSwiftTest { final InputStream in = new CryptoReadFeature(session, new SwiftReadFeature(session, regionService), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SwiftDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftAttributesFinderFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftAttributesFinderFeatureTest.java index e22898a857..bb9bb5826f 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftAttributesFinderFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftAttributesFinderFeatureTest.java @@ -4,7 +4,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -82,7 +82,7 @@ public class SwiftAttributesFinderFeatureTest extends AbstractSwiftTest { catch(NotfoundException e) { // Expected } - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -112,7 +112,7 @@ public class SwiftAttributesFinderFeatureTest extends AbstractSwiftTest { catch(NotfoundException e) { // Expected } - new SwiftDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -126,7 +126,7 @@ public class SwiftAttributesFinderFeatureTest extends AbstractSwiftTest { new AsciiRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotNull(new SwiftAttributesFinderFeature(session).find(test)); assertNotNull(new SwiftAttributesFinderFeature(session).find(new Path(container, prefix, EnumSet.of(Path.Type.directory)))); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); try { new SwiftAttributesFinderFeature(session).find(test); fail(); diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftAuthenticationServiceTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftAuthenticationServiceTest.java index 60813e0fb5..949c027ccf 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftAuthenticationServiceTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftAuthenticationServiceTest.java @@ -3,6 +3,7 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -41,25 +42,25 @@ public class SwiftAuthenticationServiceTest { }; assertEquals(Client.AuthVersion.v20, s.getRequest(new Host(protocol, "identity.api.rackspacecloud.com", new Credentials("u", "P")), - new DisabledLoginCallback()).iterator().next().getVersion()); + LoginCallback.noop).iterator().next().getVersion()); assertEquals(Client.AuthVersion.v10, s.getRequest(new Host(protocol, "region-b.geo-1.identity.hpcloudsvc.com", new Credentials("u", "P")), - new DisabledLoginCallback()).iterator().next().getVersion()); + LoginCallback.noop).iterator().next().getVersion()); assertEquals(Client.AuthVersion.v10, s.getRequest(new Host(protocol, "myhost", new Credentials("u", "P")), - new DisabledLoginCallback()).iterator().next().getVersion()); + LoginCallback.noop).iterator().next().getVersion()); assertEquals(Client.AuthVersion.v10, s.getRequest(new Host(protocol, "myhost", new Credentials("u", "P")), - new DisabledLoginCallback()).iterator().next().getVersion()); + LoginCallback.noop).iterator().next().getVersion()); assertEquals("GET", s.getRequest(new Host(protocol, "myhost", new Credentials("u", "P")), - new DisabledLoginCallback()).iterator().next().getMethod()); + LoginCallback.noop).iterator().next().getMethod()); assertEquals("POST", s.getRequest(new Host(protocol, "lon.identity.api.rackspacecloud.com", new Credentials("u", "P")), - new DisabledLoginCallback()).iterator().next().getMethod()); + LoginCallback.noop).iterator().next().getMethod()); final Host host = new Host(protocol, "identity.openstack.com", new Credentials("u", "P")); host.setPort(3451); - assertEquals(URI.create("https://identity.openstack.com:3451/v1.0"), s.getRequest(host, new DisabledLoginCallback()).iterator().next().getURI()); - assertEquals(Client.AuthVersion.v10, s.getRequest(host, new DisabledLoginCallback()).iterator().next().getVersion()); - assertEquals(Authentication10UsernameKeyRequest.class, s.getRequest(host, new DisabledLoginCallback()).iterator().next().getClass()); + assertEquals(URI.create("https://identity.openstack.com:3451/v1.0"), s.getRequest(host, LoginCallback.noop).iterator().next().getURI()); + assertEquals(Client.AuthVersion.v10, s.getRequest(host, LoginCallback.noop).iterator().next().getVersion()); + assertEquals(Authentication10UsernameKeyRequest.class, s.getRequest(host, LoginCallback.noop).iterator().next().getClass()); } @Test @@ -73,13 +74,13 @@ public class SwiftAuthenticationServiceTest { }; assertEquals(Client.AuthVersion.v20, s.getRequest(new Host(protocol, "region-b.geo-1.identity.hpcloudsvc.com", new Credentials("tenant:u", "P")), - new DisabledLoginCallback()).iterator().next().getVersion()); + LoginCallback.noop).iterator().next().getVersion()); assertEquals(Client.AuthVersion.v20, s.getRequest(new Host(protocol, "myhost", new Credentials("tenant:u", "P")), - new DisabledLoginCallback()).iterator().next().getVersion()); + LoginCallback.noop).iterator().next().getVersion()); assertEquals(Authentication20UsernamePasswordRequest.class, new ArrayList(s.getRequest(new Host(protocol, "myhost", new Credentials("tenant:u", "P")), - new DisabledLoginCallback())).get(0).getClass()); + LoginCallback.noop)).get(0).getClass()); } @Test(expected = LoginCanceledException.class) @@ -94,7 +95,7 @@ public class SwiftAuthenticationServiceTest { }; assertEquals(Client.AuthVersion.v20, s.getRequest(new Host(protocol, "region-b.geo-1.identity.hpcloudsvc.com", credentials), - new DisabledLoginCallback()).iterator().next().getVersion()); + LoginCallback.noop).iterator().next().getVersion()); } @Test @@ -132,9 +133,9 @@ public class SwiftAuthenticationServiceTest { this.getClass().getResourceAsStream("/Rackspace UK.cyberduckprofile")); final Host host = new Host(profile, profile.getDefaultHostname()); assertEquals("/v2.0/tokens", profile.getContext()); - assertEquals(URI.create("https://lon.identity.api.rackspacecloud.com/v2.0/tokens"), s.getRequest(host, new DisabledLoginCallback()).iterator().next().getURI()); - assertEquals(Client.AuthVersion.v20, s.getRequest(host, new DisabledLoginCallback()).iterator().next().getVersion()); - assertEquals(Authentication20RAXUsernameKeyRequest.class, s.getRequest(host, new DisabledLoginCallback()).iterator().next().getClass()); + assertEquals(URI.create("https://lon.identity.api.rackspacecloud.com/v2.0/tokens"), s.getRequest(host, LoginCallback.noop).iterator().next().getURI()); + assertEquals(Client.AuthVersion.v20, s.getRequest(host, LoginCallback.noop).iterator().next().getVersion()); + assertEquals(Authentication20RAXUsernameKeyRequest.class, s.getRequest(host, LoginCallback.noop).iterator().next().getClass()); } @Test @@ -147,9 +148,9 @@ public class SwiftAuthenticationServiceTest { } }; final Host host = new Host(protocol, "myidentityservice.example.net"); - assertEquals(URI.create("https://myidentityservice.example.net/v1.0"), s.getRequest(host, new DisabledLoginCallback()).iterator().next().getURI()); - assertEquals(Client.AuthVersion.v10, s.getRequest(host, new DisabledLoginCallback()).iterator().next().getVersion()); - assertEquals(Authentication10UsernameKeyRequest.class, s.getRequest(host, new DisabledLoginCallback()).iterator().next().getClass()); + assertEquals(URI.create("https://myidentityservice.example.net/v1.0"), s.getRequest(host, LoginCallback.noop).iterator().next().getURI()); + assertEquals(Client.AuthVersion.v10, s.getRequest(host, LoginCallback.noop).iterator().next().getVersion()); + assertEquals(Authentication10UsernameKeyRequest.class, s.getRequest(host, LoginCallback.noop).iterator().next().getClass()); } @Test diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDefaultCopyFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDefaultCopyFeatureTest.java index 01168ca8ab..1e356def9e 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDefaultCopyFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDefaultCopyFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Find; @@ -50,7 +50,7 @@ public class SwiftDefaultCopyFeatureTest extends AbstractSwiftTest { new SwiftDefaultCopyFeature(session).copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new SwiftFindFeature(session).find(test)); assertTrue(new SwiftFindFeature(session).find(copy)); - new SwiftDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -67,6 +67,6 @@ public class SwiftDefaultCopyFeatureTest extends AbstractSwiftTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new SwiftDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDeleteFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDeleteFeatureTest.java index fb355091d3..fc0a97518e 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDeleteFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDeleteFeatureTest.java @@ -20,7 +20,7 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.TranscriptListener; import ch.cyberduck.core.exception.NotfoundException; @@ -47,7 +47,7 @@ public class SwiftDeleteFeatureTest extends AbstractSwiftTest { public void testDeleteNotFoundBucket() throws Exception { final Path container = new Path(UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory, Path.Type.volume)); container.attributes().setRegion("IAD"); - new SwiftDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -55,7 +55,7 @@ public class SwiftDeleteFeatureTest extends AbstractSwiftTest { final Path container = new Path("test.cyberduck.ch", EnumSet.of(Path.Type.directory, Path.Type.volume)); container.attributes().setRegion("IAD"); final Path test = new Path(container, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -81,7 +81,7 @@ public class SwiftDeleteFeatureTest extends AbstractSwiftTest { assertFalse(children.contains(test)); assertTrue(list.list(placeholder, new DisabledListProgressListener()).contains(test)); assertTrue(find.find(test)); - new SwiftDeleteFeature(session).delete(Arrays.asList(placeholder, test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(placeholder, test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(find.find(test)); assertFalse(find.find(placeholder)); } @@ -107,7 +107,7 @@ public class SwiftDeleteFeatureTest extends AbstractSwiftTest { new SwiftDirectoryFeature(session).mkdir(new SwiftWriteFeature(session, new SwiftRegionService(session)), placeholder, new TransferStatus()); final SwiftFindFeature find = new SwiftFindFeature(session); assertTrue(find.find(placeholder)); - new SwiftDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(delete.get()); Thread.sleep(1000L); assertFalse(find.find(placeholder)); diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDirectoryFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDirectoryFeatureTest.java index 8bf8360f39..ac45c87ee9 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDirectoryFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDirectoryFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.TranscriptListener; import ch.cyberduck.core.features.Delete; @@ -49,7 +49,7 @@ public class SwiftDirectoryFeatureTest extends AbstractSwiftTest { assertTrue(new SwiftFindFeature(session, region).find(container)); // Can create again regardless if exists feature.mkdir(new SwiftWriteFeature(session, new SwiftRegionService(session)), test, new TransferStatus()); - new SwiftDeleteFeature(session, region).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session, region).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SwiftFindFeature(session, region).find(container)); } @@ -81,7 +81,7 @@ public class SwiftDirectoryFeatureTest extends AbstractSwiftTest { assertEquals(placeholder.attributes().getChecksum(), new SwiftAttributesFinderFeature(session, region).find(placeholder).getChecksum()); assertTrue(new SwiftObjectListService(session, region).list(placeholder, new DisabledListProgressListener()).isEmpty()); assertEquals(1, new SwiftObjectListService(session, region).list(parent, new DisabledListProgressListener()).size()); - new SwiftDeleteFeature(session, region).delete(Arrays.asList(placeholder, parent), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session, region).delete(Arrays.asList(placeholder, parent), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SwiftFindFeature(session, region).find(placeholder)); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationTest.java index a09a656f4b..a5ae196276 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationTest.java @@ -1,6 +1,6 @@ package ch.cyberduck.core.openstack; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cdn.Distribution; import ch.cyberduck.core.cdn.DistributionConfiguration; @@ -45,9 +45,9 @@ public class SwiftDistributionConfigurationTest extends AbstractSwiftTest { final DistributionConfiguration configuration = new SwiftDistributionConfiguration(session); final Path container = new Path(UUID.randomUUID().toString(), EnumSet.of(Path.Type.volume, Path.Type.directory)); new SwiftDirectoryFeature(session).mkdir(new SwiftWriteFeature(session, new SwiftRegionService(session)), container, new TransferStatus().setRegion("ORD")); - configuration.write(container, new Distribution(Distribution.DOWNLOAD, true), new DisabledLoginCallback()); - assertTrue(configuration.read(container, Distribution.DOWNLOAD, new DisabledLoginCallback()).isEnabled()); - new SwiftDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + configuration.write(container, new Distribution(Distribution.DOWNLOAD, true), LoginCallback.noop); + assertTrue(configuration.read(container, Distribution.DOWNLOAD, LoginCallback.noop).isEnabled()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -57,13 +57,13 @@ public class SwiftDistributionConfigurationTest extends AbstractSwiftTest { new SwiftDirectoryFeature(session).mkdir(new SwiftWriteFeature(session, new SwiftRegionService(session)), container, new TransferStatus().setRegion("ORD")); final Distribution config = new Distribution(Distribution.WEBSITE, true); config.setIndexDocument("index.html"); - configuration.write(container, config, new DisabledLoginCallback()); - final Distribution distribution = configuration.read(container, Distribution.WEBSITE, new DisabledLoginCallback()); + configuration.write(container, config, LoginCallback.noop); + final Distribution distribution = configuration.read(container, Distribution.WEBSITE, LoginCallback.noop); assertTrue(distribution.isEnabled()); final Map metadata = new SwiftMetadataFeature(session).getMetadata(container); assertFalse(metadata.isEmpty()); assertTrue(metadata.containsKey("X-Container-Meta-Web-Index")); assertEquals("index.html", metadata.get("X-Container-Meta-Web-Index")); - new SwiftDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDistributionPurgeFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDistributionPurgeFeatureTest.java index 9d2dd37ed9..6efc66fb55 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDistributionPurgeFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftDistributionPurgeFeatureTest.java @@ -1,6 +1,6 @@ package ch.cyberduck.core.openstack; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cdn.Distribution; import ch.cyberduck.core.exception.InteroperabilityException; @@ -23,7 +23,7 @@ public class SwiftDistributionPurgeFeatureTest extends AbstractSwiftTest { final SwiftDistributionPurgeFeature feature = new SwiftDistributionPurgeFeature(session); final Path container = new Path("test.cyberduck.ch", EnumSet.of(Path.Type.volume, Path.Type.directory)); container.attributes().setRegion("IAD"); - feature.invalidate(container, Distribution.DOWNLOAD, Collections.singletonList(container), new DisabledLoginCallback()); + feature.invalidate(container, Distribution.DOWNLOAD, Collections.singletonList(container), LoginCallback.noop); } @Test @@ -31,6 +31,6 @@ public class SwiftDistributionPurgeFeatureTest extends AbstractSwiftTest { final SwiftDistributionPurgeFeature feature = new SwiftDistributionPurgeFeature(session); final Path container = new Path("test.cyberduck.ch", EnumSet.of(Path.Type.volume, Path.Type.directory)); container.attributes().setRegion("IAD"); - feature.invalidate(container, Distribution.DOWNLOAD, Collections.singletonList(new Path(container, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file))), new DisabledLoginCallback()); + feature.invalidate(container, Distribution.DOWNLOAD, Collections.singletonList(new Path(container, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file))), LoginCallback.noop); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftFindFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftFindFeatureTest.java index 08431fbdb5..bed547f891 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftFindFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftFindFeatureTest.java @@ -4,7 +4,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.CachingFindFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.features.Delete; @@ -50,7 +50,7 @@ public class SwiftFindFeatureTest extends AbstractSwiftTest { assertFalse(feature.find(new Path(String.format("-%s", file.getAbsolute()), EnumSet.of(Path.Type.file)))); assertFalse(feature.find(new Path(String.format("-%s", file.getAbsolute()), EnumSet.of(Path.Type.directory)))); assertNotNull(new SwiftAttributesFinderFeature(session).find(file)); - new SwiftDeleteFeature(session).delete(Arrays.asList(file, other), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(file, other), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -72,7 +72,7 @@ public class SwiftFindFeatureTest extends AbstractSwiftTest { assertFalse(feature.find(new Path(String.format("-%s", file.getAbsolute()), EnumSet.of(Path.Type.file)))); assertFalse(feature.find(new Path(String.format("-%s", file.getAbsolute()), EnumSet.of(Path.Type.directory)))); assertNotNull(new SwiftAttributesFinderFeature(session).find(file)); - new SwiftDeleteFeature(session).delete(Arrays.asList(file, other), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(file, other), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -93,7 +93,7 @@ public class SwiftFindFeatureTest extends AbstractSwiftTest { assertTrue(new SwiftFindFeature(session).find(new Path(container, prefix, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); assertTrue(new SwiftObjectListService(session).list(new Path(container, prefix, EnumSet.of(Path.Type.directory)), new DisabledListProgressListener()).contains(test)); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SwiftFindFeature(session).find(test)); assertFalse(new SwiftFindFeature(session).find(new Path(container, prefix, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); final PathCache cache = new PathCache(1); diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftLargeObjectUploadFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftLargeObjectUploadFeatureTest.java index a4525b72b6..a287781b11 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftLargeObjectUploadFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftLargeObjectUploadFeatureTest.java @@ -3,8 +3,8 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -74,7 +74,7 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { } }; } - }, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, listener, status, new DisabledLoginCallback()); + }, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, listener, status, LoginCallback.noop); } catch(BackgroundException e) { // Expected @@ -89,7 +89,7 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { new SwiftLargeObjectUploadFeature(session, new SwiftRegionService(session), 1 * 1024L * 1024L, 1).upload(new SwiftWriteFeature(session, new SwiftRegionService(session)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, StreamListener.noop, append, - new DisabledLoginCallback()); + LoginCallback.noop); assertEquals(content.length, append.getResponse().getSize()); assertTrue(new SwiftFindFeature(session).find(test)); assertEquals(content.length, new SwiftAttributesFinderFeature(session).find(test).getSize()); @@ -100,7 +100,7 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -133,7 +133,7 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { final BytecountStreamListener listener = new BytecountStreamListener(); try { feature.upload(new SwiftWriteFeature(session, new SwiftRegionService(session)), test, new Local(System.getProperty("java.io.tmpdir"), name), - new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, listener, status, new DisabledLoginCallback()); + new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, listener, status, LoginCallback.noop); } catch(BackgroundException e) { // Expected @@ -150,7 +150,7 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { final TransferStatus append = new TransferStatus().setAppend(true).setLength(1024L * 1024L).setOffset(1024L * 1024L); feature.upload(new SwiftWriteFeature(session, new SwiftRegionService(session)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, listener, append, - new DisabledLoginCallback()); + LoginCallback.noop); assertEquals(2 * 1024L * 1024L, listener.getSent()); assertTrue(append.isComplete()); assertNotSame(PathAttributes.EMPTY, append.getResponse()); @@ -163,7 +163,7 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -272,7 +272,7 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { assertArrayEquals(content, buffer.toByteArray()); } - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertEquals(0, new SwiftSegmentService(session).list(test).size()); local.delete(); } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftLargeUploadWriteFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftLargeUploadWriteFeatureTest.java index 36bf96eab1..98034ea8c7 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftLargeUploadWriteFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftLargeUploadWriteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.http.HttpResponseOutputStream; @@ -87,7 +87,7 @@ public class SwiftLargeUploadWriteFeatureTest extends AbstractSwiftTest { stream.close(); assertArrayEquals(content, compare); } - new SwiftDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -113,7 +113,7 @@ public class SwiftLargeUploadWriteFeatureTest extends AbstractSwiftTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SwiftDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -161,7 +161,7 @@ public class SwiftLargeUploadWriteFeatureTest extends AbstractSwiftTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new SwiftDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMetadataFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMetadataFeatureTest.java index 1f84ffa99e..fb5dd3551a 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMetadataFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMetadataFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.openstack; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -61,6 +61,6 @@ public class SwiftMetadataFeatureTest extends AbstractSwiftTest { assertEquals("text/plain", metadata.get("Content-Type")); feature.setMetadata(test, Collections.emptyMap()); assertFalse(feature.getMetadata(test).containsKey("Test")); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMoveFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMoveFeatureTest.java index 549b42f581..0e58ca621a 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMoveFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMoveFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.openstack; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.BackgroundException; @@ -59,7 +59,7 @@ public class SwiftMoveFeatureTest extends AbstractSwiftTest { new SwiftMoveFeature(session).move(test, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new SwiftFindFeature(session).find(test)); assertTrue(new SwiftFindFeature(session).find(target)); - new SwiftDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -75,7 +75,7 @@ public class SwiftMoveFeatureTest extends AbstractSwiftTest { new SwiftMoveFeature(session).move(test, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new SwiftFindFeature(session).find(test)); assertTrue(new SwiftFindFeature(session).find(target)); - new SwiftDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMultipleDeleteFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMultipleDeleteFeatureTest.java index fee20e07a7..f3440cb222 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMultipleDeleteFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftMultipleDeleteFeatureTest.java @@ -1,8 +1,8 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AttributedList; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.NotfoundException; @@ -31,7 +31,7 @@ public class SwiftMultipleDeleteFeatureTest extends AbstractSwiftTest { new SwiftMultipleDeleteFeature(session).delete(Arrays.asList( new Path(container, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)), new Path(container, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)) - ), new DisabledLoginCallback(), new Delete.DisabledCallback()); + ), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -43,7 +43,7 @@ public class SwiftMultipleDeleteFeatureTest extends AbstractSwiftTest { @Override public void chunk(final Path folder, final AttributedList list) { try { - new SwiftMultipleDeleteFeature(session).delete(list.toList(), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftMultipleDeleteFeature(session).delete(list.toList(), LoginCallback.noop, new Delete.DisabledCallback()); } catch(BackgroundException e) { fail(e.getDetail()); diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftObjectListServiceTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftObjectListServiceTest.java index 6b0da4f8be..816be78db7 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftObjectListServiceTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftObjectListServiceTest.java @@ -20,8 +20,8 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.IndexedListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -61,7 +61,7 @@ public class SwiftObjectListServiceTest extends AbstractSwiftTest { assertTrue(list.contains(f1)); assertTrue(list.contains(f2)); assertTrue(list.contains(d1)); - new SwiftDeleteFeature(session).delete(Arrays.asList(f1, f2, d1f1, d1, placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(f1, f2, d1f1, d1, placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -74,7 +74,7 @@ public class SwiftObjectListServiceTest extends AbstractSwiftTest { final AttributedList list = new SwiftObjectListService(session).list(placeholder, new DisabledListProgressListener()); assertEquals(1, list.size()); assertTrue(list.contains(test)); - new SwiftDeleteFeature(session).delete(Arrays.asList(test, placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(test, placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -97,7 +97,7 @@ public class SwiftObjectListServiceTest extends AbstractSwiftTest { catch(NotfoundException e) { // Expected } - new SwiftDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -113,7 +113,7 @@ public class SwiftObjectListServiceTest extends AbstractSwiftTest { catch(NotfoundException e) { // Expected } - new SwiftDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -138,7 +138,7 @@ public class SwiftObjectListServiceTest extends AbstractSwiftTest { assertTrue(callback.get()); final Path placeholder2 = new SwiftDirectoryFeature(session).mkdir(new SwiftWriteFeature(session, new SwiftRegionService(session)), new Path(placeholder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new SwiftObjectListService(session).list(placeholder2, new DisabledListProgressListener()).isEmpty()); - new SwiftDeleteFeature(session).delete(Arrays.asList(placeholder, placeholder2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(placeholder, placeholder2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -152,7 +152,7 @@ public class SwiftObjectListServiceTest extends AbstractSwiftTest { assertTrue(list.contains(placeholder)); assertTrue(list.contains(new Path(container, name, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); assertSame(list.get(placeholder), list.get(new Path(container, name, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); - new SwiftDeleteFeature(session).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -182,7 +182,7 @@ public class SwiftObjectListServiceTest extends AbstractSwiftTest { assertTrue(list.contains(child)); assertEquals(EnumSet.of(Path.Type.file), list.get(child).getType()); } - new SwiftDeleteFeature(session).delete(Arrays.asList(base, child), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Arrays.asList(base, child), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -213,8 +213,8 @@ public class SwiftObjectListServiceTest extends AbstractSwiftTest { final AttributedList list = new SwiftObjectListService(session, regionService).list(directory, new DisabledListProgressListener()); for(int i = 0; i < list.size(); i++) { assertEquals(files.get(i), list.get(i).getName()); - new SwiftDeleteFeature(session, regionService).delete(Collections.singletonList(list.get(i)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session, regionService).delete(Collections.singletonList(list.get(i)), LoginCallback.noop, new Delete.DisabledCallback()); } - new SwiftDeleteFeature(session, regionService).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session, regionService).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftReadFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftReadFeatureTest.java index 5e60c59b74..98734f665c 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftReadFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftReadFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -66,7 +66,7 @@ public class SwiftReadFeatureTest extends AbstractSwiftTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -95,7 +95,7 @@ public class SwiftReadFeatureTest extends AbstractSwiftTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftSessionTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftSessionTest.java index 5cf39605e0..e8d67ebc99 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftSessionTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftSessionTest.java @@ -3,8 +3,8 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DescriptiveUrl; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProtocolFactory; @@ -73,7 +73,7 @@ public class SwiftSessionTest extends AbstractSwiftTest { PROPERTIES.get("rackspace.user"), PROPERTIES.get("rackspace.password") )); final SwiftSession session = new SwiftSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); session.close(); assertFalse(session.isConnected()); @@ -86,9 +86,9 @@ public class SwiftSessionTest extends AbstractSwiftTest { "a", "s" )); final SwiftSession session = new SwiftSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftUrlProviderTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftUrlProviderTest.java index 4b0d92aea0..3994616168 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftUrlProviderTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftUrlProviderTest.java @@ -19,8 +19,8 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.DescriptiveUrl; import ch.cyberduck.core.DescriptiveUrlBag; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.UrlProvider; import ch.cyberduck.core.features.Delete; @@ -71,6 +71,6 @@ public class SwiftUrlProviderTest extends AbstractSwiftTest { assertNotNull(s); assertNotEquals(DescriptiveUrl.EMPTY, s); } - new SwiftDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftWriteFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftWriteFeatureTest.java index a2b2650dae..fa7e1239da 100644 --- a/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftWriteFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/openstack/SwiftWriteFeatureTest.java @@ -3,7 +3,7 @@ package ch.cyberduck.core.openstack; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -61,6 +61,6 @@ public class SwiftWriteFeatureTest extends AbstractSwiftTest { assertEquals("duck", metadata.get("X-Object-Meta-C")); final OutputStream overwrite = new SwiftWriteFeature(session, regionService).write(test, new TransferStatus().setLength(0L), ConnectionCallback.noop); overwrite.close(); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/openstack/src/test/java/ch/cyberduck/core/worker/SwiftSingleTransferWorkerTest.java b/openstack/src/test/java/ch/cyberduck/core/worker/SwiftSingleTransferWorkerTest.java index a6750ddcdd..845c1c3ec6 100644 --- a/openstack/src/test/java/ch/cyberduck/core/worker/SwiftSingleTransferWorkerTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/worker/SwiftSingleTransferWorkerTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -121,7 +121,7 @@ public class SwiftSingleTransferWorkerTest extends VaultTest { return super._getFeature(type); } }; - new LoginConnectionService(new DisabledLoginCallback(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new TestPasswordStore(), ProgressListener.noop).check(session, CancelCallback.noop); @@ -136,7 +136,7 @@ public class SwiftSingleTransferWorkerTest extends VaultTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); local.delete(); @@ -145,6 +145,6 @@ public class SwiftSingleTransferWorkerTest extends VaultTest { assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); assertTrue(failed.get()); - new SwiftDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SwiftDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java b/owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java index 65b57a7479..35254a69e4 100644 --- a/owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java +++ b/owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java @@ -19,9 +19,9 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -103,7 +103,7 @@ public class OcisUploadFeatureTest extends AbstractOcisTest { final InputStream in = new CryptoReadFeature(session, new DAVReadFeature(session), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/owncloud/src/test/java/ch/cyberduck/core/owncloud/OcisUploadFeatureTest.java b/owncloud/src/test/java/ch/cyberduck/core/owncloud/OcisUploadFeatureTest.java index f14b9c254c..52de5ce10c 100644 --- a/owncloud/src/test/java/ch/cyberduck/core/owncloud/OcisUploadFeatureTest.java +++ b/owncloud/src/test/java/ch/cyberduck/core/owncloud/OcisUploadFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -107,7 +107,7 @@ public class OcisUploadFeatureTest extends AbstractOcisTest { IOUtils.readFully(new DAVReadFeature(session).read(file, new TransferStatus().setLength(content.length), ConnectionCallback.noop), compare); assertArrayEquals(content, compare); } - new DAVDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/owncloud/src/test/java/ch/cyberduck/core/owncloud/OwncloudVersioningFeatureTest.java b/owncloud/src/test/java/ch/cyberduck/core/owncloud/OwncloudVersioningFeatureTest.java index 90e6cc784f..15dd0e5530 100644 --- a/owncloud/src/test/java/ch/cyberduck/core/owncloud/OwncloudVersioningFeatureTest.java +++ b/owncloud/src/test/java/ch/cyberduck/core/owncloud/OwncloudVersioningFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.dav.DAVDeleteFeature; @@ -86,20 +86,20 @@ public class OwncloudVersioningFeatureTest extends AbstractOwncloudTest { assertNotEquals(initialAttributes, new OwncloudAttributesFinderFeature(session).find(test)); assertEquals(initialVersion.attributes(), new OwncloudAttributesFinderFeature(session).find(initialVersion)); { - final InputStream reader = new OwncloudReadFeature(session).read(initialVersion, new TransferStatus(), new DisabledLoginCallback()); + final InputStream reader = new OwncloudReadFeature(session).read(initialVersion, new TransferStatus(), LoginCallback.noop); assertArrayEquals(initialContent, IOUtils.readFully(reader, initialContent.length)); reader.close(); } final Path updatedVersion = versions.get(0); assertEquals(contentUpdate.length, new OwncloudAttributesFinderFeature(session).find(updatedVersion).getSize()); { - final InputStream reader = new OwncloudReadFeature(session).read(updatedVersion, new TransferStatus(), new DisabledLoginCallback()); + final InputStream reader = new OwncloudReadFeature(session).read(updatedVersion, new TransferStatus(), LoginCallback.noop); assertArrayEquals(contentUpdate, IOUtils.readFully(reader, contentUpdate.length)); reader.close(); } } feature.revert(initialVersion); assertEquals(initialVersion.attributes().getSize(), new OwncloudAttributesFinderFeature(session).find(test).getSize()); - new DAVDeleteFeature(session).delete(Arrays.asList(test, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(test, directory), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/s3/src/main/java/ch/cyberduck/core/auth/AWSSessionCredentialsRetriever.java b/s3/src/main/java/ch/cyberduck/core/auth/AWSSessionCredentialsRetriever.java index 83e4a974d8..d2b605fcc1 100644 --- a/s3/src/main/java/ch/cyberduck/core/auth/AWSSessionCredentialsRetriever.java +++ b/s3/src/main/java/ch/cyberduck/core/auth/AWSSessionCredentialsRetriever.java @@ -16,11 +16,10 @@ package ch.cyberduck.core.auth; */ import ch.cyberduck.core.Credentials; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledTranscriptListener; import ch.cyberduck.core.Host; import ch.cyberduck.core.HostParser; -import ch.cyberduck.core.HostUrlProvider; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.TemporaryAccessTokens; import ch.cyberduck.core.date.ISO8601DateFormatter; @@ -73,7 +72,7 @@ public class AWSSessionCredentialsRetriever implements S3CredentialsStrategy { final HttpConnectionPoolBuilder builder = new HttpConnectionPoolBuilder(address, new ThreadLocalHostnameDelegatingTrustManager(trust, address.getHostname()), key, ProxyFactory.get()); final HttpClientBuilder configuration = builder.build(ProxyFactory.get(), - new DisabledTranscriptListener(), new DisabledLoginCallback()); + new DisabledTranscriptListener(), LoginCallback.noop); try (CloseableHttpClient client = configuration.build()) { final HttpRequestBase resource = new HttpGet(url); return client.execute(resource, response -> { diff --git a/s3/src/main/java/ch/cyberduck/core/cloudfront/CloudFrontDistributionConfigurationPreloader.java b/s3/src/main/java/ch/cyberduck/core/cloudfront/CloudFrontDistributionConfigurationPreloader.java index 2857ead44e..4faad75ee2 100644 --- a/s3/src/main/java/ch/cyberduck/core/cloudfront/CloudFrontDistributionConfigurationPreloader.java +++ b/s3/src/main/java/ch/cyberduck/core/cloudfront/CloudFrontDistributionConfigurationPreloader.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.cloudfront; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.PasswordCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cdn.Distribution; @@ -57,7 +57,7 @@ public class CloudFrontDistributionConfigurationPreloader extends OneTimeSchedul if(Distribution.WEBSITE.equals(method)) { continue; } - final Distribution distribution = feature.read(container, method, new DisabledLoginCallback()); + final Distribution distribution = feature.read(container, method, LoginCallback.noop); log.info("Cache distribution {}", distribution); distributions.add(distribution); } diff --git a/s3/src/test/java/ch/cyberduck/core/cloudfront/CloudFrontDistributionConfigurationTest.java b/s3/src/test/java/ch/cyberduck/core/cloudfront/CloudFrontDistributionConfigurationTest.java index 8558b76233..8fafd2d78e 100644 --- a/s3/src/test/java/ch/cyberduck/core/cloudfront/CloudFrontDistributionConfigurationTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cloudfront/CloudFrontDistributionConfigurationTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.cloudfront; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cdn.Distribution; import ch.cyberduck.core.cdn.DistributionConfiguration; @@ -67,7 +67,7 @@ public class CloudFrontDistributionConfigurationTest extends AbstractS3Test { final DistributionConfiguration configuration = new CloudFrontDistributionConfiguration(session, new S3LocationFeature(session), new DisabledX509TrustManager(), new DefaultX509KeyManager()); final Path container = new Path("test-us-east-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); - final Distribution distribution = configuration.read(container, Distribution.DOWNLOAD, new DisabledLoginCallback()); + final Distribution distribution = configuration.read(container, Distribution.DOWNLOAD, LoginCallback.noop); assertEquals("ETW0HTI5PZK7X", distribution.getId()); assertEquals(Distribution.DOWNLOAD, distribution.getMethod()); assertEquals("Deployed", distribution.getStatus()); @@ -83,7 +83,7 @@ public class CloudFrontDistributionConfigurationTest extends AbstractS3Test { final DistributionConfiguration configuration = new CloudFrontDistributionConfiguration(session, new S3LocationFeature(session), new DisabledX509TrustManager(), new DefaultX509KeyManager()); final Path container = new Path("test-us-east-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); - final Distribution distribution = configuration.read(container, Distribution.STREAMING, new DisabledLoginCallback()); + final Distribution distribution = configuration.read(container, Distribution.STREAMING, LoginCallback.noop); assertEquals("E25267XDMTRRIW", distribution.getId()); assertEquals("test-us-east-1-cyberduck.s3.amazonaws.com", distribution.getOrigin().getHost()); assertEquals(URI.create("rtmp://s9xwj9xzlfydi.cloudfront.net/cfx/st"), distribution.getUrl()); @@ -111,7 +111,7 @@ public class CloudFrontDistributionConfigurationTest extends AbstractS3Test { }; final Path container = new Path(UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory, Path.Type.volume)); final Distribution distribution = new Distribution(Distribution.STREAMING, true); - configuration.write(container, distribution, new DisabledLoginCallback()); + configuration.write(container, distribution, LoginCallback.noop); assertTrue(set.get()); } @@ -134,7 +134,7 @@ public class CloudFrontDistributionConfigurationTest extends AbstractS3Test { }; final Path container = new Path(UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory, Path.Type.volume)); final Distribution distribution = new Distribution(Distribution.DOWNLOAD, true); - configuration.write(container, distribution, new DisabledLoginCallback()); + configuration.write(container, distribution, LoginCallback.noop); assertTrue(set.get()); } @@ -162,9 +162,9 @@ public class CloudFrontDistributionConfigurationTest extends AbstractS3Test { = new CloudFrontDistributionConfiguration(session, new S3LocationFeature(session), new DisabledX509TrustManager(), new DefaultX509KeyManager()); final Path container = new Path("/test-us-east-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path directory = new Path("/test-us-east-1-cyberduck/directory", EnumSet.of(Path.Type.directory, Path.Type.placeholder)); - final Distribution distribution = configuration.read(container, Distribution.DOWNLOAD, new DisabledLoginCallback()); + final Distribution distribution = configuration.read(container, Distribution.DOWNLOAD, LoginCallback.noop); assertEquals("ETW0HTI5PZK7X", distribution.getId()); - configuration.invalidate(container, Distribution.DOWNLOAD, Collections.singletonList(container), new DisabledLoginCallback()); - configuration.invalidate(container, Distribution.DOWNLOAD, Collections.singletonList(directory), new DisabledLoginCallback()); + configuration.invalidate(container, Distribution.DOWNLOAD, Collections.singletonList(container), LoginCallback.noop); + configuration.invalidate(container, Distribution.DOWNLOAD, Collections.singletonList(directory), LoginCallback.noop); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cloudfront/CustomOriginCloudFrontDistributionConfigurationTest.java b/s3/src/test/java/ch/cyberduck/core/cloudfront/CustomOriginCloudFrontDistributionConfigurationTest.java index 92d7b2e41a..847e0c0c71 100644 --- a/s3/src/test/java/ch/cyberduck/core/cloudfront/CustomOriginCloudFrontDistributionConfigurationTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cloudfront/CustomOriginCloudFrontDistributionConfigurationTest.java @@ -4,6 +4,7 @@ import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DescriptiveUrl; import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.TestProtocol; @@ -119,7 +120,7 @@ public class CustomOriginCloudFrontDistributionConfigurationTest extends VaultTe final Path file = new Path("/public_html", EnumSet.of(Path.Type.directory)); final Distribution writeDistributionConfiguration = new Distribution(Distribution.CUSTOM, false); // Create - final DisabledLoginCallback login = new DisabledLoginCallback() { + final LoginCallback login = new DisabledLoginCallback() { @Override public Credentials prompt(final Host bookmark, final String username, final String title, final String reason, final LoginOptions options) { return new Credentials(PROPERTIES.get("s3.key"), PROPERTIES.get("s3.secret")); @@ -150,6 +151,6 @@ public class CustomOriginCloudFrontDistributionConfigurationTest extends VaultTe final CustomOriginCloudFrontDistributionConfiguration configuration = new CustomOriginCloudFrontDistributionConfiguration(bookmark, new DefaultX509TrustManager(), new DefaultX509KeyManager()); final Path container = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); - configuration.read(container, Distribution.CUSTOM, new DisabledLoginCallback()); + configuration.read(container, Distribution.CUSTOM, LoginCallback.noop); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cloudfront/WebsiteCloudFrontDistributionConfigurationTest.java b/s3/src/test/java/ch/cyberduck/core/cloudfront/WebsiteCloudFrontDistributionConfigurationTest.java index dfd01fe536..a0309540ad 100644 --- a/s3/src/test/java/ch/cyberduck/core/cloudfront/WebsiteCloudFrontDistributionConfigurationTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cloudfront/WebsiteCloudFrontDistributionConfigurationTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.cloudfront; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cdn.Distribution; import ch.cyberduck.core.cdn.features.Cname; @@ -93,7 +93,7 @@ public class WebsiteCloudFrontDistributionConfigurationTest extends AbstractS3Te = new WebsiteCloudFrontDistributionConfiguration(session, new S3LocationFeature(session), new DisabledX509TrustManager(), new DefaultX509KeyManager() ); final Path container = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); - final Distribution distribution = configuration.read(container, Distribution.WEBSITE, new DisabledLoginCallback()); + final Distribution distribution = configuration.read(container, Distribution.WEBSITE, LoginCallback.noop); assertEquals("The specified bucket does not have a website configuration", distribution.getStatus()); } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index c1e11c65d3..7cd8e259ee 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -93,7 +93,7 @@ public class CopyWorkerTest extends AbstractS3Test { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new S3ReadFeature(session), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -119,7 +119,7 @@ public class CopyWorkerTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -145,7 +145,7 @@ public class CopyWorkerTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -177,7 +177,7 @@ public class CopyWorkerTest extends AbstractS3Test { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -207,7 +207,7 @@ public class CopyWorkerTest extends AbstractS3Test { assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new S3ReadFeature(session), cryptomator).read(encryptedFile, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -235,7 +235,7 @@ public class CopyWorkerTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(cleartextFolder)); assertTrue(new S3FindFeature(session, acl).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -264,7 +264,7 @@ public class CopyWorkerTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(encryptedFile)); assertTrue(new S3FindFeature(session, acl).find(cleartextFile)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); } @Test @@ -294,6 +294,6 @@ public class CopyWorkerTest extends AbstractS3Test { final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new S3FindFeature(session, acl).find(fileRenamed)); registry.clear(); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/CryptoS3SingleTransferWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/CryptoS3SingleTransferWorkerTest.java index 5a02aba4ec..1116ef22b0 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/CryptoS3SingleTransferWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/CryptoS3SingleTransferWorkerTest.java @@ -17,10 +17,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -101,7 +101,7 @@ public class CryptoS3SingleTransferWorkerTest extends AbstractS3Test { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); @@ -120,7 +120,7 @@ public class CryptoS3SingleTransferWorkerTest extends AbstractS3Test { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 96164b36bf..4d23570da6 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -91,14 +91,14 @@ public class MoveWorkerTest extends AbstractS3Test { new CryptoBulkFeature<>(session, new DisabledBulkFeature(), cryptomator).pre(Transfer.Type.upload, Collections.singletonMap(new TransferItem(source), status), ConnectionCallback.noop); new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(new ByteArrayInputStream(content), new CryptoWriteFeature<>(session, new S3MultipartWriteFeature(session, acl), cryptomator).write(source, status.setLength(content.length), ConnectionCallback.noop)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new S3ReadFeature(session), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(target, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(target, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -117,11 +117,11 @@ public class MoveWorkerTest extends AbstractS3Test { cryptomator.getFeature(session, Write.class, new S3WriteFeature(session, acl)), new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); final Path target = new Path(targetFolder, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -141,11 +141,11 @@ public class MoveWorkerTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(target, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(target, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -165,12 +165,12 @@ public class MoveWorkerTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); // rename file final Path fileRenamed = new Path(folder, "f1", EnumSet.of(Path.Type.file)); - new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(file)); assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(fileRenamed)); // rename folder final Path folderRenamed = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(folder)); assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(folderRenamed)); try { @@ -182,7 +182,7 @@ public class MoveWorkerTest extends AbstractS3Test { assertEquals(1, new CryptoListService(session, new S3ListService(session, acl), cryptomator).list(folderRenamed, new DisabledListProgressListener()).size()); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -202,11 +202,11 @@ public class MoveWorkerTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); // move file into vault - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(new S3FindFeature(session, acl).find(clearFile)); assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(encryptedFile)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -227,13 +227,13 @@ public class MoveWorkerTest extends AbstractS3Test { // move directory into vault final Path encryptedFolder = new Path(vault, clearFolder.getName(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, clearFile.getName(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(encryptedFolder)); assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(encryptedFile)); assertFalse(new S3FindFeature(session, acl).find(clearFolder)); assertFalse(new S3FindFeature(session, acl).find(clearFile)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -257,12 +257,12 @@ public class MoveWorkerTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move file outside vault final Path fileRenamed = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(encryptedFile)); assertTrue(new S3FindFeature(session, acl).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(fileRenamed, clearFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(fileRenamed, clearFolder), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -284,15 +284,15 @@ public class MoveWorkerTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move directory outside vault final Path directoryRenamed = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.placeholder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(encryptedFolder)); assertFalse(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(encryptedFile)); assertTrue(new S3FindFeature(session, acl).find(directoryRenamed)); final Path fileRenamed = new Path(directoryRenamed, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new S3FindFeature(session, acl).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(fileRenamed, directoryRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(fileRenamed, directoryRenamed), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3DirectoryFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3DirectoryFeatureTest.java index 27b290b77d..a1dae9cf6c 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3DirectoryFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3DirectoryFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -71,10 +71,10 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new S3AttributesFinderFeature(session, acl)).find(test); assertNotNull(attributes.getVersionId()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new CryptoListService(session, new S3ListService(session, acl), cryptomator).list(vault) .toStream().filter(f -> !f.attributes().isDuplicate() && !f.attributes().isTrashed()).collect(Collectors.toList()).isEmpty()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -92,6 +92,6 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new S3AttributesFinderFeature(session, acl)).find(test); assertEquals(versionId, attributes.getVersionId()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MoveFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MoveFeatureTest.java index 181edf5c81..f09c9b1bcb 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MoveFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.features.Delete; @@ -83,6 +83,6 @@ public class S3MoveFeatureTest extends AbstractS3Test { assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(fileRenamedInRenamedFolder)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartUploadServiceTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartUploadServiceTest.java index 46a038e078..57d2e76e1d 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartUploadServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartUploadServiceTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.cryptomator.features.CryptoBulkFeature; @@ -104,7 +104,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { final InputStream in = new CryptoReadFeature(session, new S3ReadFeature(session), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -137,7 +137,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { final InputStream in = new CryptoReadFeature(session, new S3ReadFeature(session), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -170,7 +170,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { final InputStream in = new CryptoReadFeature(session, new S3ReadFeature(session), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartWriteFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartWriteFeatureTest.java index a0c4098663..fac6dc2cf2 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartWriteFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -88,6 +88,6 @@ public class S3MultipartWriteFeatureTest extends AbstractS3Test { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3ObjectListServiceTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3ObjectListServiceTest.java index 9ab29fa168..5c1d7adbb0 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3ObjectListServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3ObjectListServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; @@ -63,6 +63,6 @@ public class S3ObjectListServiceTest extends AbstractS3Test { new CryptoTouchFeature<>(session, new S3TouchFeature(session, acl), cryptomator).touch( new CryptoWriteFeature<>(session, new S3WriteFeature(session, new S3AccessControlListFeature(session)), cryptomator), test, new TransferStatus()); assertEquals(test, new CryptoListService(session, new S3ObjectListService(session, acl), cryptomator).list(vault, new DisabledListProgressListener()).get(0)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3SingleUploadServiceTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3SingleUploadServiceTest.java index a013ba4761..9b11bd249e 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3SingleUploadServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3SingleUploadServiceTest.java @@ -18,9 +18,9 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -96,7 +96,7 @@ public class S3SingleUploadServiceTest extends AbstractS3Test { final InputStream in = new CryptoReadFeature(session, new S3ReadFeature(session), cryptomator).read(test, readStatus, ConnectionCallback.noop); new StreamCopier(readStatus, readStatus).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3TouchFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3TouchFeatureTest.java index 6ff42ecdb3..03ce148842 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3TouchFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3TouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -71,7 +71,7 @@ public class S3TouchFeatureTest extends AbstractS3Test { assertEquals(0L, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); assertEquals(test.attributes(), cryptomator.getFeature(session, AttributesFinder.class, new S3AttributesFinderFeature(session, acl)).find(test)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -89,7 +89,7 @@ public class S3TouchFeatureTest extends AbstractS3Test { assertEquals(0L, test.attributes().getSize()); assertEquals(0L, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new S3FindFeature(session, acl)).find(test)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -107,6 +107,6 @@ public class S3TouchFeatureTest extends AbstractS3Test { assertEquals(0L, test.attributes().getSize()); assertEquals(0L, status.getResponse().getSize()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3VersioningFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3VersioningFeatureTest.java index 505979d7c5..473a1961ae 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3VersioningFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3VersioningFeatureTest.java @@ -22,8 +22,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; @@ -112,6 +112,6 @@ public class S3VersioningFeatureTest extends AbstractS3Test { assertEquals(test.attributes().getSize(), reverted.getSize()); assertEquals(content.length, versions.get(0).attributes().getSize()); } - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3WriteFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3WriteFeatureTest.java index b7366277e4..f7e57965f9 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3WriteFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3WriteFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -91,6 +91,6 @@ public class S3WriteFeatureTest extends AbstractS3Test { final InputStream in = new CryptoReadFeature(session, new S3ReadFeature(session), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new S3DefaultDeleteFeature(session, acl)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/kms/KMSEncryptionFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/kms/KMSEncryptionFeatureTest.java index 3a87dc38b7..27cb6db1bd 100644 --- a/s3/src/test/java/ch/cyberduck/core/kms/KMSEncryptionFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/kms/KMSEncryptionFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.kms; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -64,7 +64,7 @@ public class KMSEncryptionFeatureTest extends AbstractS3Test { // The ETag will only be the MD5 of the object data when the object is stored as plaintext or encrypted using SSE-S3. // If the object is encrypted using another method (such as SSE-C or SSE-KMS) the ETag is not the MD5 of the object data. assertNotEquals("d41d8cd98f00b204e9800998ecf8427e", Checksum.parse(attr.getETag()).hash); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -77,19 +77,19 @@ public class KMSEncryptionFeatureTest extends AbstractS3Test { final Encryption.Algorithm value = feature.getEncryption(test); assertEquals("aws:kms", value.algorithm); assertEquals("arn:aws:kms:eu-west-1:930717317329:key/015fa0af-f95e-483e-8fb6-abffb46fb783", value.key); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testGetKeys_eu_west_1() throws Exception { final KMSEncryptionFeature kms = new KMSEncryptionFeature(session, new S3LocationFeature(session), new S3AccessControlListFeature(session), new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertFalse(kms.getKeys(new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)), new DisabledLoginCallback()).isEmpty()); + assertFalse(kms.getKeys(new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)), LoginCallback.noop).isEmpty()); } @Test public void testGetKeys_ap_southeast_2() throws Exception { final KMSEncryptionFeature kms = new KMSEncryptionFeature(session, new S3LocationFeature(session), new S3AccessControlListFeature(session), new DisabledX509TrustManager(), new DefaultX509KeyManager()); - final Set keys = kms.getKeys(new Path("test-ap-southeast-2-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)), new DisabledLoginCallback()); + final Set keys = kms.getKeys(new Path("test-ap-southeast-2-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)), LoginCallback.noop); assertTrue(keys.contains(Encryption.Algorithm.NONE)); assertTrue(keys.contains(S3EncryptionFeature.SSE_AES256)); assertEquals(2, keys.size()); diff --git a/s3/src/test/java/ch/cyberduck/core/profiles/ProfilesSynchronizeWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/profiles/ProfilesSynchronizeWorkerTest.java index 62aea9909d..086b3725d9 100644 --- a/s3/src/test/java/ch/cyberduck/core/profiles/ProfilesSynchronizeWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/profiles/ProfilesSynchronizeWorkerTest.java @@ -17,11 +17,11 @@ package ch.cyberduck.core.profiles; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.HostParser; import ch.cyberduck.core.Local; import ch.cyberduck.core.LocalFactory; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.Session; import ch.cyberduck.core.preferences.PreferencesFactory; @@ -53,7 +53,7 @@ public class ProfilesSynchronizeWorkerTest { final Host host = new HostParser(protocols, new S3Protocol()).get("s3://djynunjb246r8.cloudfront.net").setCredentials( new Credentials(PreferencesFactory.get().getProperty("connection.login.anon.name"))); final Session session = new S3Session(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); // Local directory with oudated profile final Local conflictprofile = LocalFactory.get(this.getClass().getResource("/test-conflict.cyberduckprofile").getPath()); final Local localonlyprofile = LocalFactory.get(this.getClass().getResource("/test-localonly.cyberduckprofile").getPath()); @@ -101,7 +101,7 @@ public class ProfilesSynchronizeWorkerTest { final Host host = new HostParser(protocols, new S3Protocol()).get("s3:/profiles.cyberduck.io").setCredentials( new Credentials(PreferencesFactory.get().getProperty("connection.login.anon.name"))); final Session session = new S3Session(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); // Local directory with oudated profile final Local conflictprofile = LocalFactory.get(this.getClass().getResource("/test-conflict.cyberduckprofile").getPath()); final Local localonlyprofile = LocalFactory.get(this.getClass().getResource("/test-localonly.cyberduckprofile").getPath()); diff --git a/s3/src/test/java/ch/cyberduck/core/profiles/RemoteProfilesFinderTest.java b/s3/src/test/java/ch/cyberduck/core/profiles/RemoteProfilesFinderTest.java index 93a7936214..a0e1e1af01 100644 --- a/s3/src/test/java/ch/cyberduck/core/profiles/RemoteProfilesFinderTest.java +++ b/s3/src/test/java/ch/cyberduck/core/profiles/RemoteProfilesFinderTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.profiles; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.HostParser; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.Session; import ch.cyberduck.core.io.Checksum; @@ -54,7 +54,7 @@ public class RemoteProfilesFinderTest { })); final Session session = new S3Session(new HostParser(protocols).get("s3:/profiles.cyberduck.io") .setCredentials(new Credentials(PreferencesFactory.get().getProperty("connection.login.anon.name"))), new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); final RemoteProfilesFinder finder = new RemoteProfilesFinder(session); final Set stream = finder.find(); assertFalse(stream.isEmpty()); diff --git a/s3/src/test/java/ch/cyberduck/core/restore/GlacierTest.java b/s3/src/test/java/ch/cyberduck/core/restore/GlacierTest.java index e68d898615..0db4d8b79f 100644 --- a/s3/src/test/java/ch/cyberduck/core/restore/GlacierTest.java +++ b/s3/src/test/java/ch/cyberduck/core/restore/GlacierTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.restore; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.http.HttpResponseOutputStream; @@ -64,7 +64,7 @@ public class GlacierTest extends AbstractS3Test { out.close(); assertEquals("GLACIER", new S3AttributesFinderFeature(session, acl).find(test).getStorageClass()); final Glacier feature = new Glacier(session, new S3LocationFeature(session), new DisabledX509TrustManager(), new DefaultX509KeyManager()); - feature.restore(test, new DisabledLoginCallback()); + feature.restore(test, LoginCallback.noop); new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledPasswordCallback(), new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/RequestEntityRestStorageServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/RequestEntityRestStorageServiceTest.java index 6af4b6cd9b..4eb27bd92f 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/RequestEntityRestStorageServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/RequestEntityRestStorageServiceTest.java @@ -16,9 +16,9 @@ package ch.cyberduck.core.s3; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledTranscriptListener; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.TestProtocol; import ch.cyberduck.core.http.HttpConnectionPoolBuilder; import ch.cyberduck.core.proxy.DisabledProxyFinder; @@ -50,7 +50,7 @@ public class RequestEntityRestStorageServiceTest extends AbstractS3Test { public void testSetupConnection() throws Exception { final RequestEntityRestStorageService service = new RequestEntityRestStorageService(session, new HttpConnectionPoolBuilder(session.getHost(), new ThreadLocalHostnameDelegatingTrustManager(new DisabledX509TrustManager(), session.getHost().getHostname()), - new DefaultX509KeyManager(), new DisabledProxyFinder()).build(new DisabledProxyFinder(), new DisabledTranscriptListener(), new DisabledLoginCallback())); + new DefaultX509KeyManager(), new DisabledProxyFinder()).build(new DisabledProxyFinder(), new DisabledTranscriptListener(), LoginCallback.noop)); final RegionEndpointCache cache = service.getRegionEndpointCache(); cache.clear(); final String key = new AlphanumericRandomStringService().random(); @@ -69,7 +69,7 @@ public class RequestEntityRestStorageServiceTest extends AbstractS3Test { public void testSetupConnectionVirtualHost() throws Exception { final RequestEntityRestStorageService service = new RequestEntityRestStorageService(virtualhost, new HttpConnectionPoolBuilder(virtualhost.getHost(), new ThreadLocalHostnameDelegatingTrustManager(new DisabledX509TrustManager(), virtualhost.getHost().getHostname()), - new DefaultX509KeyManager(), new DisabledProxyFinder()).build(new DisabledProxyFinder(), new DisabledTranscriptListener(), new DisabledLoginCallback())); + new DefaultX509KeyManager(), new DisabledProxyFinder()).build(new DisabledProxyFinder(), new DisabledTranscriptListener(), LoginCallback.noop)); final RegionEndpointCache cache = service.getRegionEndpointCache(); cache.clear(); final String key = new AlphanumericRandomStringService().random(); diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3AccessControlListFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3AccessControlListFeatureTest.java index 5be9b5062a..05ad7334fd 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3AccessControlListFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3AccessControlListFeatureTest.java @@ -22,8 +22,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.InteroperabilityException; import ch.cyberduck.core.exception.NotfoundException; @@ -96,7 +96,7 @@ public class S3AccessControlListFeatureTest extends AbstractS3Test { acl.addAll(new Acl.Owner("80b9982b7b08045ee86680cc47f43c84bf439494a89ece22b5330f8a49477cf6"), new Acl.Role(Acl.Role.FULL)); f.setPermission(test, acl); assertEquals(acl, f.getPermission(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -110,7 +110,7 @@ public class S3AccessControlListFeatureTest extends AbstractS3Test { acl.addAll(new Acl.GroupUser(Acl.GroupUser.AUTHENTICATED), new Acl.Role(Acl.Role.READ)); f.setPermission(test, acl); assertEquals(acl, f.getPermission(test)); - new S3DefaultDeleteFeature(virtualhost, new S3AccessControlListFeature(virtualhost)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, new S3AccessControlListFeature(virtualhost)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -127,8 +127,8 @@ public class S3AccessControlListFeatureTest extends AbstractS3Test { } }; final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path container = new Path(String.format("cd-%s", new AlphanumericRandomStringService().random().toLowerCase(Locale.getDefault())), EnumSet.of(Path.Type.directory, Path.Type.volume)); new S3BucketCreateService(session).create(container, null); final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); @@ -147,7 +147,7 @@ public class S3AccessControlListFeatureTest extends AbstractS3Test { } } assertEquals(Acl.EMPTY, f.getPermission(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -156,7 +156,7 @@ public class S3AccessControlListFeatureTest extends AbstractS3Test { final Path test = new S3TouchFeature(session, new S3AccessControlListFeature(session)).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); final S3AccessControlListFeature f = new S3AccessControlListFeature(session); assertNotNull(f.getPermission(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -165,7 +165,7 @@ public class S3AccessControlListFeatureTest extends AbstractS3Test { final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final Path placeholder = new S3DirectoryFeature(session, acl).mkdir(new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertNotNull(acl.getPermission(placeholder)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -198,7 +198,7 @@ public class S3AccessControlListFeatureTest extends AbstractS3Test { catch(NotfoundException e) { fail(); } - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3AttributesFinderFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3AttributesFinderFeatureTest.java index 5c5708fd3c..f285b86e0c 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3AttributesFinderFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3AttributesFinderFeatureTest.java @@ -4,8 +4,8 @@ import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -53,7 +53,7 @@ public class S3AttributesFinderFeatureTest extends AbstractS3Test { catch(NotfoundException e) { // Expected } - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -92,7 +92,7 @@ public class S3AttributesFinderFeatureTest extends AbstractS3Test { final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final Path test = new S3DirectoryFeature(session, acl).mkdir(new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final PathAttributes attributes = new S3AttributesFinderFeature(session, acl).find(test); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertEquals(0L, attributes.getSize()); assertEquals(Checksum.parse("d41d8cd98f00b204e9800998ecf8427e"), attributes.getChecksum()); assertNotEquals(-1L, attributes.getModificationDate()); @@ -145,7 +145,7 @@ public class S3AttributesFinderFeatureTest extends AbstractS3Test { final Path file = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("%s~", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); new S3AttributesFinderFeature(session, acl).find(file); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -155,7 +155,7 @@ public class S3AttributesFinderFeatureTest extends AbstractS3Test { final Path file = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("%s@", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); new S3AttributesFinderFeature(session, acl).find(file); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -166,7 +166,7 @@ public class S3AttributesFinderFeatureTest extends AbstractS3Test { final Path file = new S3TouchFeature(session, new S3AccessControlListFeature(session)).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(directory, String.format("%s %s", new AlphanumericRandomStringService(4).random(), new AlphanumericRandomStringService(4).random()), EnumSet.of(Path.Type.file)), new TransferStatus()); new S3AttributesFinderFeature(session, new S3AccessControlListFeature(session)).find(file); - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(directory, file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(directory, file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -180,7 +180,7 @@ public class S3AttributesFinderFeatureTest extends AbstractS3Test { new AsciiRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotNull(new S3AttributesFinderFeature(session, acl).find(test)); assertNotNull(new S3AttributesFinderFeature(session, acl).find(new Path(container, prefix, EnumSet.of(Path.Type.directory)))); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); try { new S3AttributesFinderFeature(session, acl).find(test); fail(); @@ -255,7 +255,7 @@ public class S3AttributesFinderFeatureTest extends AbstractS3Test { assertEquals(0L, attributes.getSize()); assertEquals("d41d8cd98f00b204e9800998ecf8427e", attributes.getChecksum().hash); assertNotEquals(-1L, attributes.getModificationDate()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -271,7 +271,7 @@ public class S3AttributesFinderFeatureTest extends AbstractS3Test { assertEquals(0L, attributes.getSize()); assertEquals("d41d8cd98f00b204e9800998ecf8427e", attributes.getChecksum().hash); assertNotEquals(-1L, attributes.getModificationDate()); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3BucketCreateServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3BucketCreateServiceTest.java index 27157974d4..8cf1a1b06d 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3BucketCreateServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3BucketCreateServiceTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.s3; */ import ch.cyberduck.core.AsciiRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.TranscriptListener; import ch.cyberduck.core.features.Delete; @@ -54,6 +54,6 @@ public class S3BucketCreateServiceTest extends AbstractS3Test { assertTrue(header.get()); bucket.attributes().setRegion("eu-central-1"); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(bucket)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3CopyFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3CopyFeatureTest.java index 92a49d91db..8520bf14be 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3CopyFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3CopyFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.StreamListener; @@ -48,10 +48,10 @@ public class S3CopyFeatureTest extends AbstractS3Test { new S3CopyFeature(session, acl).copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new S3FindFeature(session, acl).find(test)); assertNull(copy.attributes().getVersionId()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new S3FindFeature(session, acl).find(copy)); ; - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -66,9 +66,9 @@ public class S3CopyFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(test)); assertNull(copy.attributes().getVersionId()); assertEquals("m", new S3MetadataFeature(session, acl).getMetadata(copy).get("cyberduck")); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new S3FindFeature(session, acl).find(copy)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -80,9 +80,9 @@ public class S3CopyFeatureTest extends AbstractS3Test { final Path copy = new S3CopyFeature(session, acl).copy(test, new Path(new Path("test-eu-central-1-cyberduck-ownerenforced", EnumSet.of(Path.Type.directory, Path.Type.volume)), new AsciiRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new S3FindFeature(session, acl).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new S3FindFeature(session, acl).find(copy)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -100,9 +100,9 @@ public class S3CopyFeatureTest extends AbstractS3Test { assertNotEquals("", copy.attributes().getVersionId()); assertNotEquals(test.attributes().getVersionId(), copy.attributes().getVersionId()); assertEquals("m", new S3MetadataFeature(session, acl).getMetadata(copy).get("cyberduck")); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new S3FindFeature(session, acl).find(copy)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,8 +115,8 @@ public class S3CopyFeatureTest extends AbstractS3Test { new Path(new AsciiRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), ConnectionCallback.noop, StreamListener.noop); assertTrue(new S3FindFeature(virtualhost, acl).find(test)); assertEquals("m", new S3MetadataFeature(virtualhost, acl).getMetadata(copy).get("cyberduck")); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new S3FindFeature(virtualhost, acl).find(copy)); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3DefaultDeleteFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3DefaultDeleteFeatureTest.java index 5ff90a438a..372d287491 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3DefaultDeleteFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3DefaultDeleteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -46,7 +46,7 @@ public class S3DefaultDeleteFeatureTest extends AbstractS3Test { final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new S3TouchFeature(session, new S3AccessControlListFeature(session)).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); } @@ -57,7 +57,7 @@ public class S3DefaultDeleteFeatureTest extends AbstractS3Test { new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)); new S3TouchFeature(session, new S3AccessControlListFeature(session)).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); } @@ -67,7 +67,7 @@ public class S3DefaultDeleteFeatureTest extends AbstractS3Test { final S3AccessControlListFeature acl = new S3AccessControlListFeature(virtualhost); new S3TouchFeature(virtualhost, acl).touch(new S3WriteFeature(virtualhost, acl), test, new TransferStatus()); assertTrue(new S3FindFeature(virtualhost, acl).find(test)); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Arrays.asList(test, test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Arrays.asList(test, test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(virtualhost, acl).find(test)); } @@ -79,7 +79,7 @@ public class S3DefaultDeleteFeatureTest extends AbstractS3Test { String.format("%s %s", new AlphanumericRandomStringService().random(), new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); assertFalse(new DefaultFindFeature(session).find(test)); assertNull(new S3VersionedObjectListService(session, acl).list(container, new DisabledListProgressListener()).find(new SimplePathPredicate(test))); @@ -94,7 +94,7 @@ public class S3DefaultDeleteFeatureTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, name, EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); assertFalse(new DefaultFindFeature(session).find(test)); assertFalse(new S3FindFeature(session, acl).find(new Path(test).withAttributes(PathAttributes.EMPTY))); @@ -106,18 +106,18 @@ public class S3DefaultDeleteFeatureTest extends AbstractS3Test { public void testDeleteNotFoundKey() throws Exception { final Path container = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) public void testDeleteNotFoundBucket() throws Exception { final Path container = new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) public void testDeleteNotFoundBucketDnsNameCompatible() throws Exception { final Path container = new Path(new AlphanumericRandomStringService().random().toLowerCase(), EnumSet.of(Path.Type.directory, Path.Type.volume)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3DefaultMultipartServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3DefaultMultipartServiceTest.java index 27712ec18b..443133e88a 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3DefaultMultipartServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3DefaultMultipartServiceTest.java @@ -20,7 +20,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -93,7 +93,7 @@ public class S3DefaultMultipartServiceTest extends AbstractS3Test { assertNotNull(multipart); service.delete(first); service.delete(second); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3DirectoryFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3DirectoryFeatureTest.java index 345af86159..e68c925b5b 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3DirectoryFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3DirectoryFeatureTest.java @@ -64,7 +64,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { feature.mkdir(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus().setRegion(region.getIdentifier())); assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(region.getIdentifier(), new S3LocationFeature(session, session.getClient().getRegionEndpointCache()).getLocation(test).getIdentifier()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } } @@ -86,8 +86,8 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { } }; final S3Session session = new S3Session(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); + session.login(LoginCallback.noop, CancelCallback.noop); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final S3DirectoryFeature feature = new S3DirectoryFeature(session, acl); for(Location.Name region : Collections.singletonList(new S3LocationFeature.S3Region("us-east-1"))) { @@ -97,7 +97,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { feature.mkdir(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus().setRegion(region.getIdentifier())); assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(region.getIdentifier(), new S3LocationFeature(session, session.getClient().getRegionEndpointCache()).getLocation(test).getIdentifier()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } session.close(); } @@ -119,8 +119,8 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { } }; final S3Session session = new S3Session(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); + session.login(LoginCallback.noop, CancelCallback.noop); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final S3DirectoryFeature feature = new S3DirectoryFeature(session, acl); for(Location.Name region : Collections.singletonList(new S3LocationFeature.S3Region("us-east-1"))) { @@ -130,7 +130,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { feature.mkdir(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus().setRegion(region.getIdentifier())); assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(region.getIdentifier(), new S3LocationFeature(session, session.getClient().getRegionEndpointCache()).getLocation(test).getIdentifier()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } session.close(); } @@ -145,7 +145,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { test.attributes().setRegion(region.getIdentifier()); new S3DirectoryFeature(session, acl).mkdir(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus().setRegion(region.getIdentifier())); assertTrue(new S3FindFeature(session, acl).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -174,7 +174,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(new S3VersionedObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(test)); assertTrue(new S3VersionedObjectListService(session, acl).list(test, new DisabledListProgressListener()).isEmpty()); assertTrue(new DefaultFindFeature(session).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -191,7 +191,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { } }; final S3Session session = new S3Session(host); - final LoginConnectionService login = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), + final LoginConnectionService login = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); login.check(session, CancelCallback.noop); final String name = String.format("%s %s", new AlphanumericRandomStringService().random(), new AlphanumericRandomStringService().random()); @@ -206,7 +206,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(new S3ObjectListService(session, acl).list(test, new DisabledListProgressListener()).isEmpty()); assertTrue(new S3VersionedObjectListService(session, acl).list(test, new DisabledListProgressListener()).isEmpty()); assertTrue(new DefaultFindFeature(session).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(test, bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(test, bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -217,7 +217,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(test.getType().contains(Path.Type.placeholder)); assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()).contains(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()).contains(test)); assertFalse(new DefaultFindFeature(session).find(test)); assertFalse(new S3FindFeature(session, acl).find(test)); @@ -233,7 +233,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new S3VersionedObjectListService(session, acl).list(directory, new DisabledListProgressListener()).contains(test)); // Add delete marker - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(new Path(test).withAttributes(PathAttributes.EMPTY)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(new Path(test).withAttributes(PathAttributes.EMPTY)), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(new Path(test).withAttributes(PathAttributes.EMPTY))); assertFalse(new S3FindFeature(session, acl).find(new Path(test).withAttributes(PathAttributes.EMPTY))); assertTrue(new DefaultFindFeature(session).find(test)); @@ -256,7 +256,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); // This will only cause a delete marker being added - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(new Path(test).withAttributes(PathAttributes.EMPTY), parent), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(new Path(test).withAttributes(PathAttributes.EMPTY), parent), LoginCallback.noop, new Delete.DisabledCallback()); // Specific version is still found assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); @@ -273,7 +273,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); assertTrue(new S3ObjectListService(session, acl).list(test, new DisabledListProgressListener()).isEmpty()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -284,7 +284,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(virtualhost, acl).find(test)); assertTrue(new DefaultFindFeature(virtualhost).find(test)); assertTrue(new S3ObjectListService(virtualhost, acl).list(test, new DisabledListProgressListener()).isEmpty()); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -294,7 +294,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("%s\\%s", new AlphanumericRandomStringService().random(), new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); } @@ -310,7 +310,7 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { final Path test = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(test, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(test, directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(directory)); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3EncryptionFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3EncryptionFeatureTest.java index cfee15654e..e67c808a5c 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3EncryptionFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3EncryptionFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.s3; * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Encryption; @@ -40,7 +40,7 @@ public class S3EncryptionFeatureTest extends AbstractS3Test { @Test public void testGetAlgorithms() throws Exception { assertEquals(2, new S3EncryptionFeature(session, new S3AccessControlListFeature(session)).getKeys( - new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)), new DisabledLoginCallback()).size()); + new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)), LoginCallback.noop).size()); } @Test @@ -54,7 +54,7 @@ public class S3EncryptionFeatureTest extends AbstractS3Test { final Encryption.Algorithm value = feature.getEncryption(test); assertEquals("AES256", value.algorithm); assertNull(value.key); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -68,6 +68,6 @@ public class S3EncryptionFeatureTest extends AbstractS3Test { final Encryption.Algorithm value = feature.getEncryption(test); assertEquals("AES256", value.algorithm); assertNull(value.key); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3FindFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3FindFeatureTest.java index 18d70c1a04..cf85430192 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3FindFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3FindFeatureTest.java @@ -4,7 +4,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.CachingFindFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.features.Delete; @@ -71,7 +71,7 @@ public class S3FindFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(new Path(container, prefix, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); assertTrue(new S3ObjectListService(session, acl).list(new Path(container, prefix, EnumSet.of(Path.Type.directory)), new DisabledListProgressListener()).contains(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); assertFalse(new S3FindFeature(session, acl).find(new Path(container, prefix, EnumSet.of(Path.Type.directory)))); final PathCache cache = new PathCache(1); @@ -96,7 +96,7 @@ public class S3FindFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(virtualhost, acl).find(new Path(container, prefix, EnumSet.of(Path.Type.directory, Path.Type.placeholder)))); assertTrue(new S3ObjectListService(virtualhost, acl).list(new Path(container, prefix, EnumSet.of(Path.Type.directory)), new DisabledListProgressListener()).contains(test)); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(virtualhost, acl).find(test)); assertFalse(new S3FindFeature(virtualhost, acl).find(new Path(container, prefix, EnumSet.of(Path.Type.directory)))); final PathCache cache = new PathCache(1); diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3LocationFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3LocationFeatureTest.java index 79a09f26d0..64cdaf508d 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3LocationFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3LocationFeatureTest.java @@ -23,6 +23,7 @@ import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordStore; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; @@ -126,8 +127,8 @@ public class S3LocationFeatureTest extends AbstractS3Test { } }; final S3Session session = new S3Session(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); + session.login(LoginCallback.noop, CancelCallback.noop); final RegionEndpointCache cache = session.getClient().getRegionEndpointCache(); assertEquals(new S3LocationFeature.S3Region("eu-central-1"), new S3LocationFeature(session, cache).getLocation( new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory)) diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3MetadataFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3MetadataFeatureTest.java index 8fe5bc478b..1ad4fe2b0e 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3MetadataFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3MetadataFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -67,7 +67,7 @@ public class S3MetadataFeatureTest extends AbstractS3Test { assertFalse(metadata.containsKey(Constants.KEY_FOR_COMPLETE_METADATA)); feature.setMetadata(test, Collections.emptyMap()); assertFalse(feature.getMetadata(test).containsKey("app")); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -98,7 +98,7 @@ public class S3MetadataFeatureTest extends AbstractS3Test { test.withAttributes(status.getResponse()); assertTrue(feature.getMetadata(test).containsKey("Content-Type")); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -142,7 +142,7 @@ public class S3MetadataFeatureTest extends AbstractS3Test { assertEquals("AES256", encryption.getEncryption(test).algorithm); assertEquals(acl, acls.getPermission(test)); - new S3DefaultDeleteFeature(session, acls).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acls).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -157,6 +157,6 @@ public class S3MetadataFeatureTest extends AbstractS3Test { final Map metadata = feature.getMetadata(test); assertTrue(metadata.containsKey("Content-Type")); assertEquals("text/plain", metadata.get("Content-Type")); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3MoveFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3MoveFeatureTest.java index fb5858c153..9465d1f33e 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3MoveFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3MoveFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -63,7 +63,7 @@ public class S3MoveFeatureTest extends AbstractS3Test { assertEquals(renamed.attributes().getChecksum(), targetAttr.getChecksum()); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, test.attributes(), targetAttr)); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, renamed.attributes(), targetAttr)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -75,7 +75,7 @@ public class S3MoveFeatureTest extends AbstractS3Test { new S3MoveFeature(virtualhost, acl).move(test, renamed, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new S3FindFeature(virtualhost, acl).find(test)); assertTrue(new S3FindFeature(virtualhost, acl).find(renamed)); - new S3DefaultDeleteFeature(virtualhost, new S3AccessControlListFeature(virtualhost)).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, new S3AccessControlListFeature(virtualhost)).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -87,7 +87,7 @@ public class S3MoveFeatureTest extends AbstractS3Test { new S3MoveFeature(virtualhost, acl).move(test, renamed, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new DefaultFindFeature(virtualhost).find(test)); assertTrue(new S3FindFeature(virtualhost, acl).find(renamed)); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -117,7 +117,7 @@ public class S3MoveFeatureTest extends AbstractS3Test { assertTrue(new S3AttributesFinderFeature(session, acl).find(test).isTrashed()); assertTrue(new S3FindFeature(session, acl).find(renamed)); assertEquals(content.length, new S3AttributesFinderFeature(session, acl).find(renamed).getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -131,7 +131,7 @@ public class S3MoveFeatureTest extends AbstractS3Test { new S3MoveFeature(session, acl).move(test, renamed, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new S3FindFeature(session, acl).find(test)); assertTrue(new S3FindFeature(session, acl).find(renamed)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -156,7 +156,7 @@ public class S3MoveFeatureTest extends AbstractS3Test { new S3MoveFeature(session, acl).move(test, renamed, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new S3FindFeature(session, acl).find(test)); assertTrue(new S3FindFeature(session, acl).find(renamed)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -171,6 +171,6 @@ public class S3MoveFeatureTest extends AbstractS3Test { new S3MoveFeature(session, acl).move(test, renamed, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new S3FindFeature(session, acl).find(test)); assertTrue(new S3FindFeature(session, acl).find(renamed)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(renamed), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartCopyFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartCopyFeatureTest.java index 73a71920bb..09416c2b56 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartCopyFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartCopyFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.SHA256ChecksumCompute; @@ -64,10 +64,10 @@ public class S3MultipartCopyFeatureTest extends AbstractS3Test { assertNotEquals(test.attributes().getETag(), copied.attributes().getETag()); assertNotEquals(test.attributes().getChecksum(), copied.attributes().getETag()); assertEquals(content.length, new S3AttributesFinderFeature(session, acl).find(test).getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new S3FindFeature(session, acl).find(copy)); assertEquals(content.length, new S3AttributesFinderFeature(session, acl).find(copy).getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -87,10 +87,10 @@ public class S3MultipartCopyFeatureTest extends AbstractS3Test { feature.copy(test, copy, status, ConnectionCallback.noop, StreamListener.noop); assertTrue(new S3FindFeature(virtualhost, acl).find(test)); assertEquals(content.length, new S3AttributesFinderFeature(virtualhost, acl).find(test).getSize()); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new S3FindFeature(virtualhost, acl).find(copy)); assertEquals(content.length, new S3AttributesFinderFeature(virtualhost, acl).find(copy).getSize()); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -112,9 +112,9 @@ public class S3MultipartCopyFeatureTest extends AbstractS3Test { feature.copy(test, copy, status, ConnectionCallback.noop, StreamListener.noop); assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(content.length, new S3AttributesFinderFeature(session, acl).find(test).getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(new S3FindFeature(session, acl).find(copy)); assertEquals(content.length, new S3AttributesFinderFeature(session, acl).find(copy).getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartUploadServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartUploadServiceTest.java index 44add67566..d4b556a10b 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartUploadServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartUploadServiceTest.java @@ -5,8 +5,8 @@ import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -61,7 +61,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { status.setStorageClass(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY); final BytecountStreamListener count = new BytecountStreamListener(); service.upload(new S3WriteFeature(session, acl), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(random.length, count.getSent()); assertSame(Checksum.NONE, status.getResponse().getChecksum()); assertTrue(status.isComplete()); @@ -77,7 +77,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { // d2b77e21aa68ebdcbfb589124b9f9192-1 assertEquals(Checksum.NONE, Checksum.parse(attr.getETag())); assertEquals(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY, new S3StorageClassFeature(session, acl).getClass(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -96,7 +96,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { status.setStorageClass(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY); final BytecountStreamListener count = new BytecountStreamListener(); service.upload(new S3WriteFeature(virtualhost, acl), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(random.length, count.getSent()); assertSame(Checksum.NONE, status.getResponse().getChecksum()); assertTrue(status.isComplete()); @@ -112,7 +112,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { // d2b77e21aa68ebdcbfb589124b9f9192-1 assertEquals(Checksum.NONE, Checksum.parse(attr.getETag())); assertEquals(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY, new S3StorageClassFeature(virtualhost, acl).getClass(test)); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -133,7 +133,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { status.setStorageClass(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY); final BytecountStreamListener count = new BytecountStreamListener(); service.upload(new S3WriteFeature(session, acl), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(random.length, count.getSent()); assertSame(Checksum.NONE, status.getResponse().getChecksum()); assertEquals(random.length, status.getResponse().getSize()); @@ -145,7 +145,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { assertEquals(status.getResponse().getChecksum(), attr.getChecksum()); assertEquals(random.length, attr.getSize()); assertEquals(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY, new S3StorageClassFeature(session, acl).getClass(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -180,7 +180,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { assertNotSame(PathAttributes.EMPTY, status.getResponse()); assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(content.length, new S3AttributesFinderFeature(session, acl).find(test).getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -207,7 +207,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { assertSame(Checksum.NONE, status.getResponse().getChecksum()); assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(content.length, new S3AttributesFinderFeature(session, acl).find(test).getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -238,7 +238,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { try { feature.upload(new S3WriteFeature(session, acl), test, new Local(System.getProperty("java.io.tmpdir"), name), new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, count, status, - new DisabledLoginCallback()); + LoginCallback.noop); } catch(BackgroundException e) { // Expected @@ -267,7 +267,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -325,7 +325,7 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartWriteFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartWriteFeatureTest.java index 93a1e0012a..98391f7f39 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartWriteFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3MultipartWriteFeatureTest.java @@ -3,7 +3,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -59,7 +59,7 @@ public class S3MultipartWriteFeatureTest extends AbstractS3Test { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -90,7 +90,7 @@ public class S3MultipartWriteFeatureTest extends AbstractS3Test { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -113,7 +113,7 @@ public class S3MultipartWriteFeatureTest extends AbstractS3Test { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -137,6 +137,6 @@ public class S3MultipartWriteFeatureTest extends AbstractS3Test { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3MultipleDeleteFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3MultipleDeleteFeatureTest.java index 919a0637a5..bc645dbf65 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3MultipleDeleteFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3MultipleDeleteFeatureTest.java @@ -20,7 +20,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -50,7 +50,7 @@ public class S3MultipleDeleteFeatureTest extends AbstractS3Test { final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new S3TouchFeature(session, new S3AccessControlListFeature(session)).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); - new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Arrays.asList(test, test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Arrays.asList(test, test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); } @@ -61,7 +61,7 @@ public class S3MultipleDeleteFeatureTest extends AbstractS3Test { new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)); new S3TouchFeature(session, new S3AccessControlListFeature(session)).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); - new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); } @@ -71,7 +71,7 @@ public class S3MultipleDeleteFeatureTest extends AbstractS3Test { final S3AccessControlListFeature acl = new S3AccessControlListFeature(virtualhost); new S3TouchFeature(virtualhost, acl).touch(new S3WriteFeature(virtualhost, acl), test, new TransferStatus()); assertTrue(new S3FindFeature(virtualhost, acl).find(test)); - new S3MultipleDeleteFeature(virtualhost, acl).delete(Arrays.asList(test, test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3MultipleDeleteFeature(virtualhost, acl).delete(Arrays.asList(test, test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(virtualhost, acl).find(test)); } @@ -83,7 +83,7 @@ public class S3MultipleDeleteFeatureTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); - new S3MultipleDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3MultipleDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); } @@ -97,7 +97,7 @@ public class S3MultipleDeleteFeatureTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, name, EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); - new S3MultipleDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3MultipleDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); } { @@ -105,7 +105,7 @@ public class S3MultipleDeleteFeatureTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, name, EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); - new S3MultipleDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3MultipleDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); } assertFalse(new S3VersionedObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains( @@ -119,7 +119,7 @@ public class S3MultipleDeleteFeatureTest extends AbstractS3Test { new S3DirectoryFeature(session, acl).mkdir(new S3WriteFeature(session, new S3AccessControlListFeature(session)), container, new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(container)); new S3MultipleDeleteFeature(session, acl).delete(Arrays.asList(container, - new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file))), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file))), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -129,18 +129,18 @@ public class S3MultipleDeleteFeatureTest extends AbstractS3Test { for(int i = 0; i < 1010; i++) { keys.add(new ObjectKeyAndVersion(new AlphanumericRandomStringService().random())); } - new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(container, keys, new DisabledLoginCallback()); + new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(container, keys, LoginCallback.noop); } @Test(expected = NotfoundException.class) public void testDeleteNotFoundBucket() throws Exception { final Path container = new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)); - new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) public void testDeleteNotFoundBucketDnsNameCompatible() throws Exception { final Path container = new Path(new AlphanumericRandomStringService().random().toLowerCase(), EnumSet.of(Path.Type.directory, Path.Type.volume)); - new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3MultipleDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3ObjectListServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3ObjectListServiceTest.java index 0275a772f6..c40a70cbc9 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3ObjectListServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3ObjectListServiceTest.java @@ -80,7 +80,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { } }).isEmpty()); assertTrue(callback.get()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(feature.list(bucket, new DisabledListProgressListener()).contains(directory)); assertThrows(NotfoundException.class, () -> feature.list(directory, new DisabledListProgressListener())); } @@ -93,7 +93,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { assertThrows(NotfoundException.class, () -> new S3ObjectListService(session, acl).list(new Path(container, name, EnumSet.of(Path.Type.directory)), new DisabledListProgressListener())); final Path file = new S3TouchFeature(session, acl).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("%s-", name), EnumSet.of(Path.Type.file)), new TransferStatus()); assertThrows(NotfoundException.class, () -> new S3ObjectListService(session, acl).list(new Path(container, name, EnumSet.of(Path.Type.directory)), new DisabledListProgressListener())); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -104,7 +104,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { final Path file = new S3TouchFeature(session, acl).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, name, EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3ObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(file)); assertThrows(NotfoundException.class, () -> new S3ObjectListService(session, acl).list(new Path(container, name, EnumSet.of(Path.Type.directory)), new DisabledListProgressListener())); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -121,7 +121,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { } }; final S3Session session = new S3Session(host); - final LoginConnectionService login = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), + final LoginConnectionService login = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); login.check(session, CancelCallback.noop); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); @@ -131,7 +131,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { new S3ObjectListService(session, acl).list(new Path(directory, new AsciiRandomStringService(30).random(), EnumSet.of(Path.Type.directory)), new DisabledListProgressListener()); } finally { - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -148,7 +148,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { final Path placeholder = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("^<%%%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3ObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(placeholder)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -158,7 +158,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { final Path placeholder = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("test-\u001F-%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3ObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(placeholder)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -169,7 +169,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final AttributedList list = new S3ObjectListService(session, acl).list(placeholder, new DisabledListProgressListener()); assertTrue(list.isEmpty()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -184,7 +184,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { assertTrue(new S3ObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(placeholderTildeStart)); assertTrue(new S3ObjectListService(session, acl).list(placeholderTildeEnd, new DisabledListProgressListener()).isEmpty()); assertTrue(new S3ObjectListService(session, acl).list(placeholderTildeStart, new DisabledListProgressListener()).isEmpty()); - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(placeholderTildeEnd, placeholderTildeStart), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(placeholderTildeEnd, placeholderTildeStart), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -194,7 +194,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { final Path file = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("@%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3ObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(file)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -205,7 +205,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("%s@", UUID.randomUUID()), EnumSet.of(Path.Type.directory)), new TransferStatus()); final AttributedList list = new S3ObjectListService(session, acl).list(placeholder, new DisabledListProgressListener()); assertTrue(list.isEmpty()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = BackgroundException.class) @@ -215,8 +215,8 @@ public class S3ObjectListServiceTest extends AbstractS3Test { )); host.setProperty("s3.bucket.virtualhost.disable", String.valueOf(true)); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path container = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); new S3ObjectListService(session, new S3AccessControlListFeature(session)).list(container, new DisabledListProgressListener()); } @@ -256,7 +256,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { final Path file = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("test+%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3ObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(file)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -266,7 +266,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { final Path file = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, ".", EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3ObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(file)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -276,7 +276,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { final Path placeholder = new S3DirectoryFeature(session, acl).mkdir( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, ".", EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3ObjectListService(session, new S3AccessControlListFeature(session)).list(container, new DisabledListProgressListener()).contains(placeholder)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -287,7 +287,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("test+%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3ObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(placeholder)); assertTrue(new S3ObjectListService(session, acl).list(placeholder, new DisabledListProgressListener()).isEmpty()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -303,7 +303,7 @@ public class S3ObjectListServiceTest extends AbstractS3Test { assertNotSame(AttributedList.emptyList(), new S3ObjectListService(session, acl).list(bucket, new DisabledListProgressListener())); assertEquals("eu-central-1", cache.getRegionForBucketName(bucket.getName())); assertFalse(session.getClient().getConfiguration().getBoolProperty("s3service.disable-dns-buckets", true)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3PublicUrlProviderTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3PublicUrlProviderTest.java index 39da18e61b..8b3111a0ea 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3PublicUrlProviderTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3PublicUrlProviderTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DescriptiveUrl; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Share; @@ -48,6 +48,6 @@ public class S3PublicUrlProviderTest extends AbstractS3Test { final DescriptiveUrl url = provider.toDownloadUrl(test, Share.Sharee.world, null, new DisabledPasswordCallback()); assertNotEquals(DescriptiveUrl.EMPTY, url); assertNotNull(url.getUrl()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3ReadFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3ReadFeatureTest.java index b2985c11e0..eb349ab3a9 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3ReadFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3ReadFeatureTest.java @@ -5,7 +5,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -62,7 +62,7 @@ public class S3ReadFeatureTest extends AbstractS3Test { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -73,7 +73,7 @@ public class S3ReadFeatureTest extends AbstractS3Test { assertTrue(new S3ListService(session, new S3AccessControlListFeature(session)).list(container, new DisabledListProgressListener()).contains(test)); final InputStream in = new S3ReadFeature(session).read(test, new TransferStatus().setLength(0L), ConnectionCallback.noop); in.close(); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -98,7 +98,7 @@ public class S3ReadFeatureTest extends AbstractS3Test { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -127,7 +127,7 @@ public class S3ReadFeatureTest extends AbstractS3Test { assertEquals(rawContent.length, count.getRecv()); assertArrayEquals(rawContent, received.toByteArray()); in.close(); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -143,7 +143,7 @@ public class S3ReadFeatureTest extends AbstractS3Test { final CountingInputStream in = new CountingInputStream(new S3ReadFeature(session).read(file, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -162,7 +162,7 @@ public class S3ReadFeatureTest extends AbstractS3Test { final BytecountStreamListener count = new BytecountStreamListener(); new StreamCopier(status, status).withListener(count).transfer(in, NullOutputStream.INSTANCE); assertEquals(content.length, count.getRecv()); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -179,6 +179,6 @@ public class S3ReadFeatureTest extends AbstractS3Test { final BytecountStreamListener count = new BytecountStreamListener(); new StreamCopier(status, status).withListener(count).transfer(in, NullOutputStream.INSTANCE); assertEquals(content.length, count.getRecv()); - new S3DefaultDeleteFeature(virtualhost, new S3AccessControlListFeature(virtualhost)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, new S3AccessControlListFeature(virtualhost)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3SearchFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3SearchFeatureTest.java index 5424a4f350..31506ee161 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3SearchFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3SearchFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.exception.AccessDeniedException; @@ -56,7 +56,7 @@ public class S3SearchFeatureTest extends AbstractS3Test { assertThrows(AccessDeniedException.class, () -> feature.search(root, new SearchFilter(name), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); final Path subdir = new Path(bucket, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); assertNull(feature.search(subdir, new SearchFilter(name), new DisabledListProgressListener()).find(new SimplePathPredicate(file))); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,7 +91,7 @@ public class S3SearchFeatureTest extends AbstractS3Test { assertNotNull(result.find(new SimplePathPredicate(filesubdir))); assertEquals(subdir, result.find(new SimplePathPredicate(filesubdir)).getParent()); } - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(file, filesubdir, subdir), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(file, filesubdir, subdir), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3SessionTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3SessionTest.java index 6f7901d325..ba86d48962 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3SessionTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3SessionTest.java @@ -4,9 +4,9 @@ import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledCertificateIdentityCallback; import ch.cyberduck.core.DisabledCertificateStore; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordStore; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProgressListener; @@ -87,7 +87,7 @@ public class S3SessionTest extends AbstractS3Test { return null; } }, new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); session.close(); assertFalse(session.isConnected()); @@ -102,9 +102,9 @@ public class S3SessionTest extends AbstractS3Test { PROPERTIES.get("s3.key"), PROPERTIES.get("s3.secret") )); final S3Session session = new S3Session(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); session.close(); assertFalse(session.isConnected()); } @@ -120,10 +120,10 @@ public class S3SessionTest extends AbstractS3Test { -1L ))); final S3Session session = new S3Session(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - assertThrows(ExpiredTokenException.class, () -> session.login(new DisabledLoginCallback(), CancelCallback.noop)); + assertThrows(ExpiredTokenException.class, () -> session.login(LoginCallback.noop, CancelCallback.noop)); } @Test @@ -136,8 +136,8 @@ public class S3SessionTest extends AbstractS3Test { )); host.setDefaultPath("/test-eu-west-1-cyberduck"); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); session.close(); } @@ -151,8 +151,8 @@ public class S3SessionTest extends AbstractS3Test { )); final S3Session session = new S3Session(host); try { - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); } catch(BackgroundException e) { assertTrue(e.getCause() instanceof UnknownHostException); @@ -191,7 +191,7 @@ public class S3SessionTest extends AbstractS3Test { public void testBucketVirtualHostStyleCustomHost() throws Exception { final Host host = new Host(new S3Protocol(), "test-eu-central-1-cyberduck"); final S3Session session = new S3Session(host); - assertFalse(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop) + assertFalse(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop) .getDisableDnsBuckets()); } @@ -201,9 +201,9 @@ public class S3SessionTest extends AbstractS3Test { PROPERTIES.get("s3.key"), PROPERTIES.get("s3.secret") )); final S3Session session = new S3Session(host); - assertFalse(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop) + assertFalse(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop) .getDisableDnsBuckets()); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); } @Test @@ -221,7 +221,7 @@ public class S3SessionTest extends AbstractS3Test { }, new KeychainX509KeyManager(new DisabledCertificateIdentityCallback(), host, new DisabledCertificateStore())); final LoginConnectionService c = new LoginConnectionService( - new DisabledLoginCallback(), + LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop @@ -245,8 +245,8 @@ public class S3SessionTest extends AbstractS3Test { } }; final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); session.close(); } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3SingleUploadServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3SingleUploadServiceTest.java index 022e5a8d3a..1855aebdc2 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3SingleUploadServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3SingleUploadServiceTest.java @@ -15,9 +15,9 @@ package ch.cyberduck.core.s3; * GNU General Public License for more details. */ -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -70,13 +70,13 @@ public class S3SingleUploadServiceTest extends AbstractS3Test { status.setLength(random.length); status.setMime("text/plain"); service.upload(new S3WriteFeature(session, acl), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new S3FindFeature(session, acl).find(test)); final PathAttributes attr = new S3AttributesFinderFeature(session, acl).find(test); assertEquals(status.getResponse().getChecksum(), attr.getChecksum()); assertEquals(status.getResponse().getETag(), attr.getETag()); assertEquals(random.length, attr.getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -96,11 +96,11 @@ public class S3SingleUploadServiceTest extends AbstractS3Test { status.setLength(random.length); status.setEncryption(KMSEncryptionFeature.SSE_KMS_DEFAULT); service.upload(new S3WriteFeature(session, acl), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new S3FindFeature(session, acl).find(test)); final PathAttributes attributes = new S3AttributesFinderFeature(session, acl).find(test); assertEquals(random.length, attributes.getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -119,11 +119,11 @@ public class S3SingleUploadServiceTest extends AbstractS3Test { final TransferStatus status = new TransferStatus(); status.setLength(random.length); service.upload(new S3WriteFeature(session, acl), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, StreamListener.noop, status, new DisabledLoginCallback()); + ProgressListener.noop, StreamListener.noop, status, LoginCallback.noop); assertTrue(new S3FindFeature(session, acl).find(test)); final PathAttributes attributes = new S3AttributesFinderFeature(session, acl).find(test); assertEquals(random.length, attributes.getSize()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -136,6 +136,6 @@ public class S3SingleUploadServiceTest extends AbstractS3Test { LocalTouchFactory.get().touch(local); final TransferStatus status = new TransferStatus(); m.upload(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, StreamListener.noop, - status, new DisabledLoginCallback()); + status, LoginCallback.noop); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3StorageClassFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3StorageClassFeatureTest.java index 23bc721121..a481d08987 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3StorageClassFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3StorageClassFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.s3; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.AccessDeniedException; import ch.cyberduck.core.exception.NotfoundException; @@ -71,7 +71,7 @@ public class S3StorageClassFeatureTest extends AbstractS3Test { feature.setClass(test, S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY); assertEquals(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY, feature.getClass(test)); assertEquals(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY, new S3AttributesFinderFeature(session, new S3AccessControlListFeature(session)).find(test).getStorageClass()); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = AccessDeniedException.class) @@ -86,7 +86,7 @@ public class S3StorageClassFeatureTest extends AbstractS3Test { feature.setClass(test, S3Object.STORAGE_CLASS_STANDARD); } finally { - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -102,6 +102,6 @@ public class S3StorageClassFeatureTest extends AbstractS3Test { assertEquals(S3Object.STORAGE_CLASS_INFREQUENT_ACCESS, feature.getClass(test)); feature.setClass(test, S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY); assertEquals(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY, feature.getClass(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3ThresholdUploadServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3ThresholdUploadServiceTest.java index 1e60231977..2f319ded20 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3ThresholdUploadServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3ThresholdUploadServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.NullLocal; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; @@ -71,14 +71,14 @@ public class S3ThresholdUploadServiceTest extends AbstractS3Test { status.setStorageClass(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY); final BytecountStreamListener count = new BytecountStreamListener(); service.upload(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(random.length, count.getSent(), 0L); assertTrue(status.isComplete()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); final PathAttributes attributes = new S3AttributesFinderFeature(session, new S3AccessControlListFeature(session)).find(test); assertEquals(random.length, attributes.getSize(), 0L); assertEquals(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY, new S3StorageClassFeature(session, new S3AccessControlListFeature(session)).getClass(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -96,7 +96,7 @@ public class S3ThresholdUploadServiceTest extends AbstractS3Test { status.setStorageClass(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY); final BytecountStreamListener count = new BytecountStreamListener(); service.upload(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(random.length, count.getSent()); assertTrue(status.isComplete()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); @@ -104,7 +104,7 @@ public class S3ThresholdUploadServiceTest extends AbstractS3Test { assertEquals(random.length, attributes.getSize()); assertEquals(S3Object.STORAGE_CLASS_REDUCED_REDUNDANCY, new S3StorageClassFeature(session, new S3AccessControlListFeature(session)).getClass(test)); final Map metadata = new S3MetadataFeature(session, new S3AccessControlListFeature(session)).getMetadata(test); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -122,13 +122,13 @@ public class S3ThresholdUploadServiceTest extends AbstractS3Test { status.setMime("text/plain"); final BytecountStreamListener count = new BytecountStreamListener(); service.upload(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - ProgressListener.noop, count, status, new DisabledLoginCallback()); + ProgressListener.noop, count, status, LoginCallback.noop); assertEquals(random.length, count.getSent()); assertTrue(status.isComplete()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); final PathAttributes attributes = new S3AttributesFinderFeature(session, new S3AccessControlListFeature(session)).find(test); assertEquals(random.length, attributes.getSize()); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3TimestampFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3TimestampFeatureTest.java index 57d215846e..9a1d88f67f 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3TimestampFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3TimestampFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -79,7 +79,7 @@ public class S3TimestampFeatureTest extends AbstractS3Test { new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), status, new Delete.DisabledCallback(), ConnectionCallback.noop); assertEquals(1630305150000L, moved.attributes().getModificationDate()); assertEquals(1630305150000L, new S3AttributesFinderFeature(session, acl).find(moved).getModificationDate()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(moved), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(moved), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3TouchFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3TouchFeatureTest.java index 59d9adc919..75e32b6f3c 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3TouchFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3TouchFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.AccessDeniedException; @@ -48,7 +48,7 @@ public class S3TouchFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(test.attributes(), new S3AttributesFinderFeature(session, acl).find(test)); assertEquals(test.attributes(), new DefaultAttributesFinderFeature(session).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); } @@ -63,7 +63,7 @@ public class S3TouchFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(virtualhost, acl).find(test)); assertEquals(test.attributes(), new S3AttributesFinderFeature(virtualhost, acl).find(test)); assertEquals(test.attributes(), new DefaultAttributesFinderFeature(virtualhost).find(test)); - new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(virtualhost, acl).find(test)); } @@ -77,7 +77,7 @@ public class S3TouchFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(test.attributes(), new DefaultAttributesFinderFeature(session).find(test)); assertEquals(test.attributes(), new S3AttributesFinderFeature(session, acl).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); } @@ -90,7 +90,7 @@ public class S3TouchFeatureTest extends AbstractS3Test { assertNull(test.attributes().getVersionId()); assertTrue(new S3FindFeature(session, acl).find(test)); assertEquals(test.attributes(), new S3AttributesFinderFeature(session, acl).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); } @@ -115,7 +115,7 @@ public class S3TouchFeatureTest extends AbstractS3Test { new DefaultPathAttributes(file.attributes()).setVersionId(version1)))); assertTrue(new S3FindFeature(session, acl).find(new Path(file.getParent(), file.getName(), file.getType(), new DefaultPathAttributes(file.attributes()).setVersionId(version2)))); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(new Path(file).withAttributes(PathAttributes.EMPTY)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(new Path(file).withAttributes(PathAttributes.EMPTY)), LoginCallback.noop, new Delete.DisabledCallback()); // Versioned files are not deleted but with delete marker added assertTrue(new DefaultFindFeature(session).find(new Path(file.getParent(), file.getName(), file.getType(), new DefaultPathAttributes(file.attributes()).setVersionId(version1)))); diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3TransferAccelerationServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3TransferAccelerationServiceTest.java index b813539b12..be8ad519d6 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3TransferAccelerationServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3TransferAccelerationServiceTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.s3; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.TranscriptListener; import ch.cyberduck.core.features.Delete; @@ -77,7 +77,7 @@ public class S3TransferAccelerationServiceTest extends AbstractS3Test { out.close(); assertTrue(b.get()); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); service.configure(false, container); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3UrlProviderTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3UrlProviderTest.java index 2c429848d5..9a0bf913f8 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3UrlProviderTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3UrlProviderTest.java @@ -4,8 +4,8 @@ import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DescriptiveUrl; import ch.cyberduck.core.DescriptiveUrlBag; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.features.Home; @@ -36,7 +36,7 @@ public class S3UrlProviderTest extends AbstractS3Test { @Override public RequestEntityRestStorageService getClient() { try { - return this.connect(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + return this.connect(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); } catch(BackgroundException e) { fail(); @@ -108,7 +108,7 @@ public class S3UrlProviderTest extends AbstractS3Test { @Override public RequestEntityRestStorageService getClient() { try { - return this.connect(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + return this.connect(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); } catch(BackgroundException e) { fail(); @@ -128,7 +128,7 @@ public class S3UrlProviderTest extends AbstractS3Test { @Override public RequestEntityRestStorageService getClient() { try { - return this.connect(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + return this.connect(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); } catch(BackgroundException e) { fail(); diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3VersionedObjectListServiceTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3VersionedObjectListServiceTest.java index 8205d8213f..86c21beb46 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3VersionedObjectListServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3VersionedObjectListServiceTest.java @@ -22,9 +22,9 @@ import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Filter; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -88,7 +88,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { final S3VersionedObjectListService feature = new S3VersionedObjectListService(session, acl); assertTrue(feature.list(bucket, new DisabledListProgressListener()).contains(directory)); assertTrue(feature.list(directory, new DisabledListProgressListener()).isEmpty()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(feature.list(bucket, new DisabledListProgressListener()).contains(directory)); try { feature.list(directory, new DisabledListProgressListener()); @@ -118,7 +118,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { catch(NotfoundException e) { // Expected } - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -134,7 +134,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { catch(NotfoundException e) { // Expected } - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -193,7 +193,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { assertEquals(versions.get(0), list.get(1)); new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList( new Path(file).withAttributes(new DefaultPathAttributes().setVersionId("null")), - new Path(file).withAttributes(new DefaultAttributesFinderFeature(session).find(file)), bucket), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new Path(file).withAttributes(new DefaultAttributesFinderFeature(session).find(file)), bucket), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -204,7 +204,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { final Path placeholder = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("^<%%%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3VersionedObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(placeholder)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -215,7 +215,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { final Path placeholder = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("test-\u001F-%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3VersionedObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(placeholder)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -226,7 +226,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { final Path placeholder = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(container, String.format("test+%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(new S3VersionedObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(placeholder)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -239,7 +239,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(directory, String.format("test+%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3VersionedObjectListService(session, acl).list(directory, new DisabledListProgressListener()).contains(placeholder)); assertTrue(new S3VersionedObjectListService(session, acl).list(placeholder, new DisabledListProgressListener()).isEmpty()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } // | directory placeholder without delete marker | directory placeholder with delete marker | no directory placeholder @@ -259,7 +259,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { assertFalse(isDuplicate(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); // Nullify version to add delete marker directory.attributes().setVersionId(null); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(isTrashed(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); } @@ -280,17 +280,17 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { assertTrue(new S3VersionedObjectListService(session, acl).list(directory, new DisabledListProgressListener()).contains(child2)); // Nullify version to add delete marker child2.attributes().setVersionId(null); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(child1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(child1), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(isTrashed(child1, new S3VersionedObjectListService(session, acl).list(directory, new DisabledListProgressListener()))); assertFalse(isTrashed(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); assertFalse(isDuplicate(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); // Nullify version to add delete marker directory.attributes().setVersionId(null); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); // No placeholder object but child object under this prefix should still be found assertTrue(isTrashed(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); assertFalse(isDuplicate(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(child2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(child2), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(isTrashed(child2, new S3VersionedObjectListService(session, acl).list(directory, new DisabledListProgressListener()))); assertTrue(isTrashed(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); } @@ -312,10 +312,10 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { assertTrue(new S3VersionedObjectListService(session, acl).list(directory, new DisabledListProgressListener()).contains(child2)); // Nullify version to add delete marker child2.attributes().setVersionId(null); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(child1), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(child1), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(isTrashed(child1, new S3VersionedObjectListService(session, acl).list(directory, new DisabledListProgressListener()))); assertFalse(isTrashed(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(child2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(child2), LoginCallback.noop, new Delete.DisabledCallback()); assertTrue(isTrashed(child2, new S3VersionedObjectListService(session, acl).list(directory, new DisabledListProgressListener()))); // Prefix with only deleted files must be marked as hidden assertTrue(isDuplicate(directory, new S3VersionedObjectListService(session, acl).list(bucket, new DisabledListProgressListener()))); @@ -348,7 +348,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { file.withAttributes(new S3AttributesFinderFeature(session, acl).find(file)); assertNotNull(new S3VersionedObjectListService(session, acl).list(container, new DisabledListProgressListener()) .find(new SimplePathPredicate(file))); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -358,7 +358,7 @@ public class S3VersionedObjectListServiceTest extends AbstractS3Test { final Path placeholder = new S3DirectoryFeature(session, acl).mkdir( new S3WriteFeature(session, acl), new Path(container, ".", EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new S3VersionedObjectListService(session, acl).list(container, new DisabledListProgressListener()).contains(placeholder)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(placeholder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3VersioningFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3VersioningFeatureTest.java index 21ac52da01..d476f5a1f0 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3VersioningFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3VersioningFeatureTest.java @@ -22,7 +22,7 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.VersioningConfiguration; @@ -73,9 +73,9 @@ public class S3VersioningFeatureTest extends AbstractS3Test { final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); new S3DirectoryFeature(session, acl).mkdir(new S3WriteFeature(session, new S3AccessControlListFeature(session)), container, new TransferStatus()); final Versioning feature = new S3VersioningFeature(session, acl); - feature.setConfiguration(container, new DisabledLoginCallback(), new VersioningConfiguration(true, false)); + feature.setConfiguration(container, LoginCallback.noop, new VersioningConfiguration(true, false)); assertTrue(feature.getConfiguration(container).isEnabled()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -133,6 +133,6 @@ public class S3VersioningFeatureTest extends AbstractS3Test { assertEquals(updated.getVersionId(), versions.get(0).attributes().getVersionId()); assertEquals(initialVersion, versions.get(1).attributes().getVersionId()); } - new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(directory, test, ignored), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Arrays.asList(directory, test, ignored), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/s3/S3WriteFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/s3/S3WriteFeatureTest.java index 975fc64680..a31076571d 100644 --- a/s3/src/test/java/ch/cyberduck/core/s3/S3WriteFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/s3/S3WriteFeatureTest.java @@ -7,8 +7,8 @@ import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.Profile; @@ -57,7 +57,7 @@ public class S3WriteFeatureTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(test)); assertTrue(new S3AccessControlListFeature(session) .getPermission(test).asList().contains(new Acl.UserAndRole(new Acl.GroupUser(Acl.GroupUser.EVERYONE), new Acl.Role(Acl.Role.READ)))); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -88,7 +88,7 @@ public class S3WriteFeatureTest extends AbstractS3Test { final Path moved = new S3MoveFeature(session, acl).move(test, new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertEquals(1630305150000L, new S3AttributesFinderFeature(session, acl).find(moved).getModificationDate()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(moved), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(moved), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = InteroperabilityException.class) @@ -118,8 +118,8 @@ public class S3WriteFeatureTest extends AbstractS3Test { PROPERTIES.get("s3.key"), PROPERTIES.get("s3.secret") )); final S3Session session = new S3Session(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); + session.login(LoginCallback.noop, CancelCallback.noop); final S3WriteFeature feature = new S3WriteFeature(session, new S3AccessControlListFeature(session)); final Path container = new Path("test-us-east-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path file = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); @@ -134,7 +134,7 @@ public class S3WriteFeatureTest extends AbstractS3Test { assertEquals(status.getResponse().getChecksum(), attr.getChecksum()); assertEquals(status.getResponse().getETag(), attr.getETag()); assertEquals(content.length, attr.getSize()); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } @@ -155,8 +155,8 @@ public class S3WriteFeatureTest extends AbstractS3Test { } }; final S3Session session = new S3Session(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); + session.login(LoginCallback.noop, CancelCallback.noop); final S3WriteFeature feature = new S3WriteFeature(session, new S3AccessControlListFeature(session)); final Path container = new Path("test-us-east-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path file = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); @@ -171,7 +171,7 @@ public class S3WriteFeatureTest extends AbstractS3Test { assertEquals(status.getResponse().getChecksum(), attr.getChecksum()); assertEquals(status.getResponse().getETag(), attr.getETag()); assertEquals(content.length, attr.getSize()); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } @@ -192,7 +192,7 @@ public class S3WriteFeatureTest extends AbstractS3Test { assertEquals(status.getResponse().getChecksum(), attr.getChecksum()); assertEquals(status.getResponse().getETag(), attr.getETag()); assertEquals(content.length, attr.getSize()); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -211,7 +211,7 @@ public class S3WriteFeatureTest extends AbstractS3Test { assertEquals(status.getResponse().getChecksum(), attr.getChecksum()); assertEquals(status.getResponse().getETag(), attr.getETag()); assertEquals(content.length, attr.getSize()); - new S3DefaultDeleteFeature(virtualhost, new S3AccessControlListFeature(virtualhost)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(virtualhost, new S3AccessControlListFeature(virtualhost)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -232,6 +232,6 @@ public class S3WriteFeatureTest extends AbstractS3Test { assertEquals(status.getResponse().getChecksum(), attr.getChecksum()); assertEquals(status.getResponse().getETag(), attr.getETag()); assertEquals(content.length, attr.getSize()); - new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, new S3AccessControlListFeature(session)).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java index 21589ec345..d10f0355da 100644 --- a/s3/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.CachingAttributesFinderFeature; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -123,7 +123,7 @@ public class CachingAttributesFinderFeatureTest extends AbstractS3Test { assertEquals(newVersion, f.find(file.withAttributes(PathAttributes.EMPTY)).getVersionId()); assertNotEquals(initialVersion, f.find(file.withAttributes(new DefaultPathAttributes(file.attributes()).setVersionId(newVersion))).getVersionId()); assertEquals(new S3AttributesAdapter(session.getHost()).toAttributes(out.getStatus()).getVersionId(), f.find(file).getVersionId()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/shared/CachingFindFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/shared/CachingFindFeatureTest.java index 2b795a4057..1714a9606d 100644 --- a/s3/src/test/java/ch/cyberduck/core/shared/CachingFindFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/shared/CachingFindFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.CachingFindFeature; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -64,6 +64,6 @@ public class CachingFindFeatureTest extends AbstractS3Test { return false; } }).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java index f34a6dc326..8d277d5375 100644 --- a/s3/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.AttributesFinder; @@ -90,6 +90,6 @@ public class DefaultAttributesFinderFeatureTest extends AbstractS3Test { assertEquals(newVersion, f.find(file.withAttributes(new DefaultPathAttributes(file.attributes()).setVersionId(newVersion))).getVersionId()); assertNotEquals(initialVersion, f.find(file.withAttributes(new DefaultPathAttributes(file.attributes()).setVersionId(newVersion))).getVersionId()); assertEquals(new S3AttributesAdapter(session.getHost()).toAttributes(out.getStatus()).getVersionId(), f.find(file).getVersionId()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java index 50fda0ea21..deef204a91 100644 --- a/s3/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.BandwidthThrottle; @@ -88,6 +88,6 @@ public class DefaultDownloadFeatureTest extends AbstractS3Test { in.close(); assertArrayEquals(content, buffer); } - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/shared/DefaultFindFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/shared/DefaultFindFeatureTest.java index d0ad99c3e2..27cf26d27e 100644 --- a/s3/src/test/java/ch/cyberduck/core/shared/DefaultFindFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/shared/DefaultFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.shared; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.s3.AbstractS3Test; @@ -49,6 +49,6 @@ public class DefaultFindFeatureTest extends AbstractS3Test { // Find without version id set in attributes assertTrue(new DefaultFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(file)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/shared/DefaultTouchFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/shared/DefaultTouchFeatureTest.java index a9a5c1c4c7..7e256ef44b 100644 --- a/s3/src/test/java/ch/cyberduck/core/shared/DefaultTouchFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/shared/DefaultTouchFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.shared; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -51,6 +51,6 @@ public class DefaultTouchFeatureTest extends AbstractS3Test { assertEquals(0L, attributes.getSize()); assertEquals("d41d8cd98f00b204e9800998ecf8427e", attributes.getChecksum().hash); assertNotEquals(-1L, attributes.getModificationDate()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/sts/AssumeRoleWithWebIdentityAuthenticationTest.java b/s3/src/test/java/ch/cyberduck/core/sts/AssumeRoleWithWebIdentityAuthenticationTest.java index ffe663fd5c..3f3187fb65 100644 --- a/s3/src/test/java/ch/cyberduck/core/sts/AssumeRoleWithWebIdentityAuthenticationTest.java +++ b/s3/src/test/java/ch/cyberduck/core/sts/AssumeRoleWithWebIdentityAuthenticationTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.sts; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.OAuthTokens; import ch.cyberduck.core.Path; import ch.cyberduck.core.Protocol; @@ -57,8 +57,8 @@ public class AssumeRoleWithWebIdentityAuthenticationTest extends AbstractAssumeR final Credentials credentials = new Credentials("rouser", "rouser"); final Host host = new Host(profile, profile.getDefaultHostname(), credentials); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); assertEquals("rouser", credentials.getUsername()); assertEquals("rouser", credentials.getPassword()); @@ -80,8 +80,8 @@ public class AssumeRoleWithWebIdentityAuthenticationTest extends AbstractAssumeR AbstractAssumeRoleWithWebIdentityTest.class.getResourceAsStream("/S3 (OIDC).cyberduckprofile")); final Host host = new Host(profile, profile.getDefaultHostname(), new Credentials("WrongUsername", "rouser")); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - assertThrows(LoginFailureException.class, () -> session.login(new DisabledLoginCallback(), CancelCallback.noop)); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + assertThrows(LoginFailureException.class, () -> session.login(LoginCallback.noop, CancelCallback.noop)); session.close(); } @@ -91,8 +91,8 @@ public class AssumeRoleWithWebIdentityAuthenticationTest extends AbstractAssumeR AbstractAssumeRoleWithWebIdentityTest.class.getResourceAsStream("/S3 (OIDC).cyberduckprofile")); final Host host = new Host(profile, profile.getDefaultHostname(), new Credentials("rouser", "invalidPassword")); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - assertThrows(LoginFailureException.class, () -> session.login(new DisabledLoginCallback(), CancelCallback.noop)); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + assertThrows(LoginFailureException.class, () -> session.login(LoginCallback.noop, CancelCallback.noop)); session.close(); } @@ -103,8 +103,8 @@ public class AssumeRoleWithWebIdentityAuthenticationTest extends AbstractAssumeR final Credentials credentials = new Credentials("rawuser", "rawuser"); final Host host = new Host(profile, profile.getDefaultHostname(), credentials); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final OAuthTokens oauth = credentials.getOauth(); assertTrue(oauth.validate()); @@ -143,10 +143,10 @@ public class AssumeRoleWithWebIdentityAuthenticationTest extends AbstractAssumeR .setTokens(TemporaryAccessTokens.EMPTY); final Host host = new Host(profile, profile.getDefaultHostname(), credentials); final S3Session session = new S3Session(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); - assertThrows(LoginFailureException.class, () -> session.login(new DisabledLoginCallback(), CancelCallback.noop)); + assertThrows(LoginFailureException.class, () -> session.login(LoginCallback.noop, CancelCallback.noop)); } /** @@ -167,7 +167,7 @@ public class AssumeRoleWithWebIdentityAuthenticationTest extends AbstractAssumeR )); final Host host = new Host(profile, profile.getDefaultHostname(), credentials); final S3Session session = new S3Session(host); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); assertTrue(session.isConnected()); assertNotNull(session.getClient()); new S3BucketListService(session).list( diff --git a/s3/src/test/java/ch/cyberduck/core/sts/AssumeRoleWithWebIdentityAuthorizationTest.java b/s3/src/test/java/ch/cyberduck/core/sts/AssumeRoleWithWebIdentityAuthorizationTest.java index 0aa982c17a..8be1e297fb 100644 --- a/s3/src/test/java/ch/cyberduck/core/sts/AssumeRoleWithWebIdentityAuthorizationTest.java +++ b/s3/src/test/java/ch/cyberduck/core/sts/AssumeRoleWithWebIdentityAuthorizationTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Protocol; import ch.cyberduck.core.ProtocolFactory; @@ -59,8 +59,8 @@ public class AssumeRoleWithWebIdentityAuthorizationTest extends AbstractAssumeRo AbstractAssumeRoleWithWebIdentityTest.class.getResourceAsStream("/S3 (OIDC).cyberduckprofile")); final Host host = new Host(profile, profile.getDefaultHostname(), new Credentials("rawuser", "rawuser")); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path container = new Path("cyberduckbucket", EnumSet.of(Path.Type.directory, Path.Type.volume)); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(container)); session.close(); @@ -72,8 +72,8 @@ public class AssumeRoleWithWebIdentityAuthorizationTest extends AbstractAssumeRo AbstractAssumeRoleWithWebIdentityTest.class.getResourceAsStream("/S3 (OIDC).cyberduckprofile")); final Host host = new Host(profile, profile.getDefaultHostname(), new Credentials("rouser", "rouser")); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final TransferStatus status = new TransferStatus(); final Path container = new Path("cyberduckbucket", EnumSet.of(Path.Type.directory, Path.Type.volume)); new S3ReadFeature(session).read(new Path(container, "testfile.txt", EnumSet.of(Path.Type.file)), status, ConnectionCallback.noop); @@ -86,14 +86,14 @@ public class AssumeRoleWithWebIdentityAuthorizationTest extends AbstractAssumeRo AbstractAssumeRoleWithWebIdentityTest.class.getResourceAsStream("/S3 (OIDC).cyberduckprofile")); final Host host = new Host(profile, profile.getDefaultHostname(), new Credentials("rawuser", "rawuser")); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path container = new Path("cyberduckbucket", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); new S3TouchFeature(session, acl).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(test)); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new S3FindFeature(session, acl).find(test)); session.close(); } @@ -104,8 +104,8 @@ public class AssumeRoleWithWebIdentityAuthorizationTest extends AbstractAssumeRo AbstractAssumeRoleWithWebIdentityTest.class.getResourceAsStream("/S3 (OIDC).cyberduckprofile")); final Host host = new Host(profile, profile.getDefaultHostname(), new Credentials("rouser", "rouser")); final S3Session session = new S3Session(host); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path container = new Path("cyberduckbucket", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); assertThrows(AccessDeniedException.class, () -> new S3TouchFeature(session, new S3AccessControlListFeature(session)).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), test, new TransferStatus())); diff --git a/s3/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java index 5a61494170..83bf0d6ad1 100644 --- a/s3/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.Acl; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -69,7 +69,7 @@ public class CopyWorkerTest extends AbstractS3Test { assertTrue(new S3AccessControlListFeature(session).getPermission(target).asList().contains( new Acl.UserAndRole(new Acl.GroupUser(Acl.GroupUser.EVERYONE), new Acl.Role(Acl.Role.READ)) )); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(source, target), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(source, target), ProgressListener.noop).run(session); } @Test @@ -88,7 +88,7 @@ public class CopyWorkerTest extends AbstractS3Test { worker.run(session); assertTrue(new S3FindFeature(session, acl).find(sourceFile)); assertTrue(new S3FindFeature(session, acl).find(targetFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); } @Test @@ -110,6 +110,6 @@ public class CopyWorkerTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(targetFile)); assertTrue(new S3FindFeature(session, acl).find(folder)); assertTrue(new S3FindFeature(session, acl).find(sourceFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(folder, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(folder, targetFolder), ProgressListener.noop).run(session); } } diff --git a/s3/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java index 29cf2d5d16..249b07310a 100644 --- a/s3/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/worker/DeleteWorkerTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.worker; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -56,7 +56,7 @@ public class DeleteWorkerTest extends AbstractS3Test { final Path file = new S3TouchFeature(session, acl).touch( new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNull(file.attributes().getVersionId()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(folder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(folder), ProgressListener.noop).run(session); assertFalse(new S3FindFeature(session, acl).find(file)); } @@ -71,7 +71,7 @@ public class DeleteWorkerTest extends AbstractS3Test { new S3WriteFeature(session, new S3AccessControlListFeature(session)), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotNull(file.attributes().getVersionId()); assertTrue(new S3FindFeature(session, acl).find(file)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(folder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(folder), ProgressListener.noop).run(session); // Find delete marker assertTrue(new S3FindFeature(session, acl).find(file)); assertTrue(new S3AttributesFinderFeature(session, acl).find(file).isDuplicate()); diff --git a/s3/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java index 28e87a9aa2..f60b5addd4 100644 --- a/s3/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/worker/MoveWorkerTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AsciiRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -66,7 +66,7 @@ public class MoveWorkerTest extends AbstractS3Test { ) )); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(source)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(source)); assertTrue(new S3FindFeature(session, new S3AccessControlListFeature(session)).find(target)); @@ -78,7 +78,7 @@ public class MoveWorkerTest extends AbstractS3Test { assertTrue(new S3AccessControlListFeature(session).getPermission(target).asList().contains( new Acl.UserAndRole(new Acl.GroupUser(Acl.GroupUser.EVERYONE), new Acl.Role(Acl.Role.READ)) )); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(target), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(target), ProgressListener.noop).run(session); } @Test @@ -99,12 +99,12 @@ public class MoveWorkerTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(test)); final S3VersionedObjectListService list = new S3VersionedObjectListService(session, acl); final AttributedList versioned = list.list(sourceDirectory, new DisabledListProgressListener()); - final Map result = new MoveWorker(Collections.singletonMap(sourceDirectory, targetDirectory), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + final Map result = new MoveWorker(Collections.singletonMap(sourceDirectory, targetDirectory), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertEquals(4, result.size()); for(Map.Entry entry : result.entrySet()) { assertFalse(new S3FindFeature(session, acl).find(entry.getKey().withAttributes(PathAttributes.EMPTY))); assertTrue(new S3FindFeature(session, acl).find(entry.getValue())); } - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(targetDirectory), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(targetDirectory), ProgressListener.noop).run(session); } } diff --git a/s3/src/test/java/ch/cyberduck/core/worker/S3SingleTransferWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/worker/S3SingleTransferWorkerTest.java index b0d6779af2..aed8a449d2 100644 --- a/s3/src/test/java/ch/cyberduck/core/worker/S3SingleTransferWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/worker/S3SingleTransferWorkerTest.java @@ -103,12 +103,12 @@ public class S3SingleTransferWorkerTest extends AbstractS3Test { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); byte[] compare = new byte[content.length]; assertArrayEquals(content, IOUtils.toByteArray(localFile.getInputStream())); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); localFile.delete(); } @@ -169,7 +169,7 @@ public class S3SingleTransferWorkerTest extends AbstractS3Test { return super._getFeature(type); } }; - new LoginConnectionService(new DisabledLoginCallback(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop).connect(session, CancelCallback.noop); @@ -183,7 +183,7 @@ public class S3SingleTransferWorkerTest extends AbstractS3Test { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); local.delete(); @@ -193,7 +193,7 @@ public class S3SingleTransferWorkerTest extends AbstractS3Test { assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); assertTrue(failed.get()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -244,7 +244,7 @@ public class S3SingleTransferWorkerTest extends AbstractS3Test { return super._getFeature(type); } }; - new LoginConnectionService(new DisabledLoginCallback(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop).connect(session, CancelCallback.noop); @@ -258,7 +258,7 @@ public class S3SingleTransferWorkerTest extends AbstractS3Test { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); local.delete(); @@ -268,6 +268,6 @@ public class S3SingleTransferWorkerTest extends AbstractS3Test { assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); assertTrue(failed.get()); - new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new S3DefaultDeleteFeature(session, acl).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/s3/src/test/java/ch/cyberduck/core/worker/TouchWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/worker/TouchWorkerTest.java index c62bbfedf2..5e5668a41d 100644 --- a/s3/src/test/java/ch/cyberduck/core/worker/TouchWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/worker/TouchWorkerTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Encryption; import ch.cyberduck.core.proxy.DisabledProxyFinder; @@ -61,8 +61,8 @@ public class TouchWorkerTest extends AbstractS3Test { return super._getFeature(type); } }; - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new Path("sse-test-us-east-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path test = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); assertEquals(test, new TouchWorker(test).run(session)); diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBAttributesFinderFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBAttributesFinderFeatureTest.java index a09e88a33b..073c44866a 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBAttributesFinderFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBAttributesFinderFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.smb; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -60,7 +60,7 @@ public class SMBAttributesFinderFeatureTest extends AbstractSMBTest { assertNotEquals(-1L, attributes.getModificationDate()); // Test wrong type assertThrows(NotfoundException.class, () -> f.find(new Path(test.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new SMBDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -72,6 +72,6 @@ public class SMBAttributesFinderFeatureTest extends AbstractSMBTest { assertNotEquals(-1L, attributes.getModificationDate()); // Test wrong type assertThrows(NotfoundException.class, () -> f.find(new Path(test.getAbsolute(), EnumSet.of(Path.Type.file)))); - new SMBDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBCopyFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBCopyFeatureTest.java index fdf718a176..e8c44858b4 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBCopyFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBCopyFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.smb; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -54,7 +54,7 @@ public class SMBCopyFeatureTest extends AbstractSMBTest { ListService list = new SMBListService(session); assertTrue(list.list(home, new DisabledListProgressListener()).contains(file)); assertTrue(list.list(destinationFolder, new DisabledListProgressListener()).contains(copy)); - new SMBDeleteFeature(session).delete(Arrays.asList(file, copy, destinationFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Arrays.asList(file, copy, destinationFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -72,6 +72,6 @@ public class SMBCopyFeatureTest extends AbstractSMBTest { ListService list = new SMBListService(session); assertTrue(list.list(sourceFolder, new DisabledListProgressListener()).contains(file)); assertTrue(list.list(destinationFolder, new DisabledListProgressListener()).contains(copy)); - new SMBDeleteFeature(session).delete(Arrays.asList(file, sourceFolder, copy, destinationFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Arrays.asList(file, sourceFolder, copy, destinationFolder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBDirectoryFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBDirectoryFeatureTest.java index c9f555eb12..faaf2634e6 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBDirectoryFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBDirectoryFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.smb; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -42,6 +42,6 @@ public class SMBDirectoryFeatureTest extends AbstractSMBTest { new SMBWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new SMBFindFeature(session).find(test)); assertThrows(ConflictException.class, () -> new SMBDirectoryFeature(session).mkdir(new SMBWriteFeature(session), test, new TransferStatus())); - new SMBDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBFindFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBFindFeatureTest.java index 25612497af..01e2f7d2f4 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBFindFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.smb; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; @@ -53,7 +53,7 @@ public class SMBFindFeatureTest extends AbstractSMBTest { new SMBTouchFeature(session).touch(new SMBWriteFeature(session), file, new TransferStatus()); assertTrue(new SMBFindFeature(session).find(file)); assertFalse(new SMBFindFeature(session).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new SMBDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBListServiceTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBListServiceTest.java index 09a8ce7ac8..128104dd4c 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBListServiceTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBListServiceTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.smb; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -57,7 +57,7 @@ public class SMBListServiceTest extends AbstractSMBTest { assertEquals(2, result.size()); assertTrue(result.contains(testFile)); assertTrue(result.contains(innerFolder)); - new SMBDeleteFeature(session).delete(Arrays.asList(innerFolder, testFile, testFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Arrays.asList(innerFolder, testFile, testFolder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -67,6 +67,6 @@ public class SMBListServiceTest extends AbstractSMBTest { new SMBWriteFeature(session), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final AttributedList result = new SMBListService(session).list(emptyFolder, new DisabledListProgressListener()); assertEquals(0, result.size()); - new SMBDeleteFeature(session).delete(Collections.singletonList(emptyFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(emptyFolder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBMoveFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBMoveFeatureTest.java index c1ca8c2b0d..7d2ba0b5ec 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBMoveFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBMoveFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.smb; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -62,7 +62,7 @@ public class SMBMoveFeatureTest extends AbstractSMBTest { assertTrue(new SMBFindFeature(session).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, fileRenamed.getName(), EnumSet.of(Path.Type.file)); assertTrue(new SMBFindFeature(session).find(fileRenamedInRenamedFolder)); - new SMBDeleteFeature(session).delete(Collections.singletonList(folderRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(folderRenamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -77,7 +77,7 @@ public class SMBMoveFeatureTest extends AbstractSMBTest { new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new SMBFindFeature(session).find(file)); assertTrue(new SMBFindFeature(session).find(fileRenamed)); - new SMBDeleteFeature(session).delete(Collections.singletonList(fileRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(fileRenamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -95,6 +95,6 @@ public class SMBMoveFeatureTest extends AbstractSMBTest { final Path file = new SMBTouchFeature(session).touch(new SMBWriteFeature(session), new Path(home, StringUtils.upperCase(name), EnumSet.of(Path.Type.file)), new TransferStatus()); final Path rename = new Path(home, StringUtils.lowerCase(name), EnumSet.of(Path.Type.file)); new SMBMoveFeature(session).move(file, rename, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); - new SMBDeleteFeature(session).delete(Collections.singletonList(rename), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(rename), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBReadFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBReadFeatureTest.java index 8a21defce7..9c59d0989b 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBReadFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBReadFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.smb; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -111,7 +111,7 @@ public class SMBReadFeatureTest extends AbstractSMBTest { System.arraycopy(content, 65537, reference, 0, reference.length); assertArrayEquals(reference, buffer.toByteArray()); } - new SMBDeleteFeature(session).delete(Arrays.asList(test, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Arrays.asList(test, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBSessionTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBSessionTest.java index a256df4873..4b0578c829 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBSessionTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBSessionTest.java @@ -16,9 +16,9 @@ package ch.cyberduck.core.smb; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.ListService; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.PathContainerService; import ch.cyberduck.core.cdn.DistributionConfiguration; import ch.cyberduck.core.exception.ConnectionRefusedException; @@ -48,7 +48,7 @@ public class SMBSessionTest extends AbstractSMBTest { final Host host = new Host(new SMBProtocol(), session.getHost().getHostname(), 135) .setCredentials(session.getHost().getCredentials()); final SMBSession session = new SMBSession(host); - assertThrows(ConnectionRefusedException.class, () -> session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertThrows(ConnectionRefusedException.class, () -> session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); } @Test diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBTimestampFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBTimestampFeatureTest.java index 260f752d22..b08c5c2b30 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBTimestampFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBTimestampFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.smb; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -74,7 +74,7 @@ public class SMBTimestampFeatureTest extends AbstractSMBTest { PathAttributes newAttributes = new SMBAttributesFinderFeature(session).find(test); assertEquals(status.getModified().longValue(), newAttributes.getModificationDate()); assertEquals(content.length, newAttributes.getSize()); - new SMBDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -89,6 +89,6 @@ public class SMBTimestampFeatureTest extends AbstractSMBTest { new SMBTimestampFeature(session).setTimestamp(f, status); PathAttributes newAttributes = new SMBAttributesFinderFeature(session).find(f); assertEquals(status.getModified().longValue(), newAttributes.getModificationDate()); - new SMBDeleteFeature(session).delete(Collections.singletonList(f), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(f), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBTouchFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBTouchFeatureTest.java index b14185ec95..d07180306a 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBTouchFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBTouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.smb; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -57,6 +57,6 @@ public class SMBTouchFeatureTest extends AbstractSMBTest { final Path home = new DefaultHomeFinderService(session).find(); final Path test = new SMBTouchFeature(session).touch( new SMBWriteFeature(session), new Path(home, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)), new TransferStatus()); - new SMBDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/smb/src/test/java/ch/cyberduck/core/smb/SMBWriteFeatureTest.java b/smb/src/test/java/ch/cyberduck/core/smb/SMBWriteFeatureTest.java index 4f9a8e8d56..f8cce9802a 100644 --- a/smb/src/test/java/ch/cyberduck/core/smb/SMBWriteFeatureTest.java +++ b/smb/src/test/java/ch/cyberduck/core/smb/SMBWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.smb; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Write; @@ -81,6 +81,6 @@ public class SMBWriteFeatureTest extends AbstractSMBTest { new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - new SMBDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SMBDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraAttributesFinderFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraAttributesFinderFeatureTest.java index ca23a5e7ee..37e5fb2506 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraAttributesFinderFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraAttributesFinderFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.spectra; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -56,7 +56,7 @@ public class SpectraAttributesFinderFeatureTest extends AbstractSpectraTest { catch(NotfoundException e) { // Expected } - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -67,7 +67,7 @@ public class SpectraAttributesFinderFeatureTest extends AbstractSpectraTest { assertEquals(-1L, attributes.getSize()); assertNull(attributes.getRegion()); assertEquals(EnumSet.of(Path.Type.directory, Path.Type.volume), container.getType()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -88,7 +88,7 @@ public class SpectraAttributesFinderFeatureTest extends AbstractSpectraTest { assertEquals(Checksum.parse("d41d8cd98f00b204e9800998ecf8427e"), attributes.getChecksum()); // Missing support for modification date assertEquals(-1L, attributes.getModificationDate()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -99,7 +99,7 @@ public class SpectraAttributesFinderFeatureTest extends AbstractSpectraTest { final Path file = new Path(container, String.format("%s~", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)); new SpectraTouchFeature(session).touch(new SpectraWriteFeature(session), file, new TransferStatus()); new SpectraAttributesFinderFeature(session).find(file); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -110,6 +110,6 @@ public class SpectraAttributesFinderFeatureTest extends AbstractSpectraTest { final Path file = new Path(container, String.format("%s@", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)); new SpectraTouchFeature(session).touch(new SpectraWriteFeature(session), file, new TransferStatus()); new SpectraAttributesFinderFeature(session).find(file); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraBulkServiceTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraBulkServiceTest.java index b960bc63b9..35b0d3c329 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraBulkServiceTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraBulkServiceTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.spectra; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.NotfoundException; @@ -57,7 +57,7 @@ public class SpectraBulkServiceTest extends AbstractSpectraTest { assertFalse(status.getParameters().isEmpty()); assertNotNull(status.getParameters().get("job")); bulk.query(Transfer.Type.upload, file, status); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -75,7 +75,7 @@ public class SpectraBulkServiceTest extends AbstractSpectraTest { assertEquals(1, set.size()); assertEquals(1, bulk.query(Transfer.Type.upload, directory, directoryStatus).size()); assertEquals(1, bulk.query(Transfer.Type.upload, directory, fileStatus).size()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -122,7 +122,7 @@ public class SpectraBulkServiceTest extends AbstractSpectraTest { catch(BackgroundException e) { // } - new SpectraDeleteFeature(session).delete(Arrays.asList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Arrays.asList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -153,7 +153,7 @@ public class SpectraBulkServiceTest extends AbstractSpectraTest { assertTrue(s.getLength() > 0); } } - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Ignore diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraDeleteFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraDeleteFeatureTest.java index 972207a4ab..df16683195 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraDeleteFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraDeleteFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.spectra; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -39,6 +39,6 @@ public class SpectraDeleteFeatureTest extends AbstractSpectraTest { container.attributes().setRegion("US"); new SpectraDirectoryFeature(session).mkdir(new SpectraWriteFeature(session), container, new TransferStatus()); assertTrue(new SpectraFindFeature(session).find(container)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraDirectoryFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraDirectoryFeatureTest.java index d489fbc0e9..21148fea23 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraDirectoryFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraDirectoryFeatureTest.java @@ -15,7 +15,7 @@ package ch.cyberduck.core.spectra; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultFindFeature; @@ -40,7 +40,7 @@ public class SpectraDirectoryFeatureTest extends AbstractSpectraTest { final Path test = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)); feature.mkdir(new SpectraWriteFeature(session), test, new TransferStatus()); assertTrue(new SpectraFindFeature(session).find(test)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -53,6 +53,6 @@ public class SpectraDirectoryFeatureTest extends AbstractSpectraTest { new SpectraWriteFeature(session), new Path(container, name, EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new SpectraFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(test)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraFindFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraFindFeatureTest.java index 678fdc8fc5..e631d48d92 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraFindFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraFindFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.spectra; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -41,7 +41,7 @@ public class SpectraFindFeatureTest extends AbstractSpectraTest { final Path test = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final SpectraFindFeature f = new SpectraFindFeature(session); assertFalse(f.find(test)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -55,7 +55,7 @@ public class SpectraFindFeatureTest extends AbstractSpectraTest { final Path container = new SpectraDirectoryFeature(session).mkdir( new SpectraWriteFeature(session), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); assertTrue(new SpectraFindFeature(session).find(container)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraMultipleDeleteFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraMultipleDeleteFeatureTest.java index ad0df9cbe0..73f9ae0653 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraMultipleDeleteFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraMultipleDeleteFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.spectra; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -50,9 +50,9 @@ public class SpectraMultipleDeleteFeatureTest extends AbstractSpectraTest { IOUtils.write(content, out); out.close(); assertTrue(new SpectraFindFeature(session).find(test)); - new SpectraDeleteFeature(session).delete(Arrays.asList(test, test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Arrays.asList(test, test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SpectraFindFeature(session).find(test)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -62,14 +62,14 @@ public class SpectraMultipleDeleteFeatureTest extends AbstractSpectraTest { final Path test = new SpectraDirectoryFeature(session).mkdir( new SpectraWriteFeature(session), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new SpectraFindFeature(session).find(test)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SpectraFindFeature(session).find(test)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) public void testDeleteNotFoundBucket() throws Exception { final Path container = new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraObjectListServiceTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraObjectListServiceTest.java index 85bfd1942e..fc4e06ac34 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraObjectListServiceTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraObjectListServiceTest.java @@ -18,8 +18,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.SimplePathPredicate; import ch.cyberduck.core.VersioningConfiguration; @@ -60,7 +60,7 @@ public class SpectraObjectListServiceTest extends AbstractSpectraTest { catch(NotfoundException e) { // Expected } - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -77,7 +77,7 @@ public class SpectraObjectListServiceTest extends AbstractSpectraTest { new SpectraWriteFeature(session), new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final AttributedList list = new SpectraObjectListService(session).list(placeholder, new DisabledListProgressListener()); assertTrue(list.isEmpty()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,7 +115,7 @@ public class SpectraObjectListServiceTest extends AbstractSpectraTest { for(Path f : list) { assertTrue(f.attributes().getMetadata().isEmpty()); } - new SpectraDeleteFeature(session).delete(Arrays.asList(test, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Arrays.asList(test, folder), LoginCallback.noop, new Delete.DisabledCallback()); for(Path f : new SpectraObjectListService(session).list(folder, new DisabledListProgressListener())) { assertTrue(f.attributes().isDuplicate()); if(f.attributes().getSize() == 0L) { @@ -125,7 +125,7 @@ public class SpectraObjectListServiceTest extends AbstractSpectraTest { assertTrue(f.attributes().getMetadata().isEmpty()); } } - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -135,7 +135,7 @@ public class SpectraObjectListServiceTest extends AbstractSpectraTest { final Path file = new SpectraTouchFeature(session).touch( new SpectraWriteFeature(session), new Path(container, String.format("test+%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotNull(new SpectraObjectListService(session).list(container, new DisabledListProgressListener()).find(new SimplePathPredicate(file))); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -145,7 +145,7 @@ public class SpectraObjectListServiceTest extends AbstractSpectraTest { final Path file = new SpectraTouchFeature(session).touch( new SpectraWriteFeature(session), new Path(container, ".", EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotNull(new SpectraObjectListService(session).list(container, new DisabledListProgressListener()).find(new SimplePathPredicate(file))); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -155,7 +155,7 @@ public class SpectraObjectListServiceTest extends AbstractSpectraTest { final Path placeholder = new SpectraDirectoryFeature(session).mkdir( new SpectraWriteFeature(session), new Path(container, ".", EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new SpectraObjectListService(session).list(container, new DisabledListProgressListener()).contains(placeholder)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -166,6 +166,6 @@ public class SpectraObjectListServiceTest extends AbstractSpectraTest { new SpectraWriteFeature(session), new Path(container, String.format("test+%s", new AlphanumericRandomStringService().random()), EnumSet.of(Path.Type.directory)), new TransferStatus()); assertTrue(new SpectraObjectListService(session).list(container, new DisabledListProgressListener()).contains(placeholder)); assertTrue(new SpectraObjectListService(session).list(placeholder, new DisabledListProgressListener()).isEmpty()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraReadFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraReadFeatureTest.java index 8ec343f973..96b27aaf18 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraReadFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraReadFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.spectra; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -57,7 +57,7 @@ public class SpectraReadFeatureTest extends AbstractSpectraTest { catch(NotfoundException e) { // Expected } - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -79,8 +79,8 @@ public class SpectraReadFeatureTest extends AbstractSpectraTest { new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); in.close(); - new SpectraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraSessionTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraSessionTest.java index cd5a4e5ca8..3ba80e558b 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraSessionTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraSessionTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.spectra; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Scheme; import ch.cyberduck.core.exception.LoginFailureException; @@ -49,8 +49,8 @@ public class SpectraSessionTest extends AbstractSpectraTest { )); final SpectraSession session = new SpectraSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); new SpectraBucketListService(session).list(new DefaultHomeFinderService(session).find(), new DisabledListProgressListener()); } @@ -66,8 +66,8 @@ public class SpectraSessionTest extends AbstractSpectraTest { )); final SpectraSession session = new SpectraSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); new SpectraBucketListService(session).list(new DefaultHomeFinderService(session).find(), new DisabledListProgressListener()); } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraTouchFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraTouchFeatureTest.java index a87be4e345..2bfe23806b 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraTouchFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraTouchFeatureTest.java @@ -15,7 +15,7 @@ package ch.cyberduck.core.spectra; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Home; @@ -48,8 +48,8 @@ public class SpectraTouchFeatureTest extends AbstractSpectraTest { final Path test = new Path(container, new AlphanumericRandomStringService().random() + ".txt", EnumSet.of(Path.Type.file)); new SpectraTouchFeature(session).touch(new SpectraWriteFeature(session), test, new TransferStatus()); assertTrue(new SpectraFindFeature(session).find(test)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SpectraFindFeature(session).find(test)); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraUploadFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraUploadFeatureTest.java index 6a38583108..246a347221 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraUploadFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraUploadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.spectra; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -70,7 +70,7 @@ public class SpectraUploadFeatureTest extends AbstractSpectraTest { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -110,9 +110,9 @@ public class SpectraUploadFeatureTest extends AbstractSpectraTest { status1, ConnectionCallback.noop); upload.upload(new SpectraWriteFeature(session), test2, local2, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, StreamListener.noop, status2, ConnectionCallback.noop); - new SpectraDeleteFeature(session).delete(Arrays.asList(test1, test2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Arrays.asList(test1, test2), LoginCallback.noop, new Delete.DisabledCallback()); local1.delete(); local2.delete(); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraVersioningFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraVersioningFeatureTest.java index ea67af3715..76b41a90db 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraVersioningFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraVersioningFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.spectra; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.VersioningConfiguration; import ch.cyberduck.core.features.Delete; @@ -42,8 +42,8 @@ public class SpectraVersioningFeatureTest extends AbstractSpectraTest { final Path container = new SpectraDirectoryFeature(session).mkdir( new SpectraWriteFeature(session), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); final Versioning feature = new SpectraVersioningFeature(session); - feature.setConfiguration(container, new DisabledLoginCallback(), new VersioningConfiguration(true, false)); + feature.setConfiguration(container, LoginCallback.noop, new VersioningConfiguration(true, false)); assertTrue(feature.getConfiguration(container).isEnabled()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraWriteFeatureTest.java b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraWriteFeatureTest.java index d0457d5889..151c1bc3e9 100644 --- a/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraWriteFeatureTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/spectra/SpectraWriteFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.spectra; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.CRC32ChecksumCompute; @@ -68,7 +68,7 @@ public class SpectraWriteFeatureTest extends AbstractSpectraTest { out.close(); } assertEquals(content.length, new SpectraAttributesFinderFeature(session).find(test).getSize()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -88,7 +88,7 @@ public class SpectraWriteFeatureTest extends AbstractSpectraTest { assertNotNull(out); new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(new ByteArrayInputStream(content), out); out.close(); - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -131,6 +131,6 @@ public class SpectraWriteFeatureTest extends AbstractSpectraTest { new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content2, buffer.toByteArray()); } - new SpectraDeleteFeature(session).delete(Collections.singletonList(container), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(container), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/spectra/src/test/java/ch/cyberduck/core/worker/SpectraSingleTransferWorkerTest.java b/spectra/src/test/java/ch/cyberduck/core/worker/SpectraSingleTransferWorkerTest.java index 23e8f020b8..42c2a48b3a 100644 --- a/spectra/src/test/java/ch/cyberduck/core/worker/SpectraSingleTransferWorkerTest.java +++ b/spectra/src/test/java/ch/cyberduck/core/worker/SpectraSingleTransferWorkerTest.java @@ -20,9 +20,9 @@ import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -147,7 +147,7 @@ public class SpectraSingleTransferWorkerTest extends VaultTest { return super._getFeature(type); } }; - new LoginConnectionService(new DisabledLoginCallback(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new TestPasswordStore(), ProgressListener.noop).check(session, CancelCallback.noop); @@ -161,7 +161,7 @@ public class SpectraSingleTransferWorkerTest extends VaultTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); local.delete(); @@ -169,6 +169,6 @@ public class SpectraSingleTransferWorkerTest extends VaultTest { assertEquals(content.length, counter.getSent(), 0L); assertTrue(failed.get()); assertEquals(content.length, new SpectraAttributesFinderFeature(session).find(test).getSize()); - new SpectraDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SpectraDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 5e95fb3ae6..8818f9d1a8 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -95,7 +95,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new SFTPReadFeature(session), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -119,7 +119,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -144,7 +144,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -175,7 +175,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -200,7 +200,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { worker.run(session); assertTrue(new SFTPFindFeature(session).find(cleartextFile)); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(encryptedFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -227,7 +227,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new SFTPFindFeature(session).find(cleartextFolder)); assertTrue(new SFTPFindFeature(session).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -255,7 +255,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(encryptedFile)); assertTrue(new SFTPFindFeature(session).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); registry.clear(); } @@ -284,7 +284,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { assertTrue(new SFTPFindFeature(session).find(cleartextFolder)); final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new SFTPFindFeature(session).find(fileRenamed)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); registry.clear(); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/CryptoSFTPSingleTransferWorkerTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/CryptoSFTPSingleTransferWorkerTest.java index 41cc9d8277..f0b4cad6b5 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/CryptoSFTPSingleTransferWorkerTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/CryptoSFTPSingleTransferWorkerTest.java @@ -19,10 +19,10 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; @@ -122,7 +122,7 @@ public class CryptoSFTPSingleTransferWorkerTest extends AbstractSFTPTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(dir1)); @@ -144,7 +144,7 @@ public class CryptoSFTPSingleTransferWorkerTest extends AbstractSFTPTest { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java index 3e94c89b21..a64dd43667 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java @@ -15,8 +15,8 @@ package ch.cyberduck.core.cryptomator; * GNU General Public License for more details. */ -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -59,6 +59,6 @@ public class DefaultTouchFeatureTest extends AbstractSFTPTest { new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index ece27b7118..55bf8a769d 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -90,14 +90,14 @@ public class MoveWorkerTest extends AbstractSFTPTest { new CryptoBulkFeature<>(session, new DisabledBulkFeature(), cryptomator).pre(Transfer.Type.upload, Collections.singletonMap(new TransferItem(source), status), ConnectionCallback.noop); new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(new ByteArrayInputStream(content), new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator).write(source, status.setLength(content.length), ConnectionCallback.noop)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new SFTPReadFeature(session), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -116,11 +116,11 @@ public class MoveWorkerTest extends AbstractSFTPTest { cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -140,11 +140,11 @@ public class MoveWorkerTest extends AbstractSFTPTest { cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), targetFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(targetFolder)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(source, target), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -164,12 +164,12 @@ public class MoveWorkerTest extends AbstractSFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(file)); // rename file final Path fileRenamed = new Path(folder, "f1", EnumSet.of(Path.Type.file)); - new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(file, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(file)); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(fileRenamed)); // rename folder final Path folderRenamed = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()).run(session); + new MoveWorker(Collections.singletonMap(folder, folderRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop).run(session); assertFalse(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(folder)); try { assertTrue(new CryptoListService(session, new SFTPListService(session), cryptomator).list(folder, new DisabledListProgressListener()).isEmpty()); @@ -181,7 +181,7 @@ public class MoveWorkerTest extends AbstractSFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(fileRenamedInRenamedFolder)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -201,11 +201,11 @@ public class MoveWorkerTest extends AbstractSFTPTest { cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), encryptedFolder, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); // move file into vault - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFile, encryptedFile), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(new SFTPFindFeature(session).find(clearFile)); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(encryptedFile)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -226,13 +226,13 @@ public class MoveWorkerTest extends AbstractSFTPTest { // move directory into vault final Path encryptedFolder = new Path(vault, clearFolder.getName(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, clearFile.getName(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(clearFolder, encryptedFolder), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFolder)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertFalse(new SFTPFindFeature(session).find(clearFolder)); assertFalse(new SFTPFindFeature(session).find(clearFile)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(encryptedFile, encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -256,12 +256,12 @@ public class MoveWorkerTest extends AbstractSFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move file outside vault final Path fileRenamed = new Path(clearFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFile, fileRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(encryptedFile)); assertTrue(new SFTPFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(encryptedFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new SFTPDeleteFeature(session).delete(Arrays.asList(fileRenamed, clearFolder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(encryptedFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(fileRenamed, clearFolder), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } @@ -283,15 +283,15 @@ public class MoveWorkerTest extends AbstractSFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); // move directory outside vault final Path directoryRenamed = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, new DisabledLoginCallback()); + final MoveWorker worker = new MoveWorker(Collections.singletonMap(encryptedFolder, directoryRenamed), new SessionPool.SingleSessionPool(session), PathCache.empty(), ProgressListener.noop, LoginCallback.noop); worker.run(session); assertFalse(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(encryptedFolder)); assertFalse(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(encryptedFile)); assertTrue(new SFTPFindFeature(session).find(directoryRenamed)); final Path fileRenamed = new Path(directoryRenamed, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new SFTPFindFeature(session).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Collections.singletonList(vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new SFTPDeleteFeature(session).delete(Arrays.asList(fileRenamed, directoryRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Collections.singletonList(vault), LoginCallback.noop, new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(fileRenamed, directoryRenamed), LoginCallback.noop, new Delete.DisabledCallback()); registry.clear(); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPAttributesFinderFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPAttributesFinderFeatureTest.java index 0e48ecafaa..9a59fc96b7 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPAttributesFinderFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPAttributesFinderFeatureTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.Cache; import ch.cyberduck.core.CachingAttributesFinderFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -71,7 +71,7 @@ public class SFTPAttributesFinderFeatureTest extends AbstractSFTPTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session)).find(test); assertNotNull(attributes); assertEquals(0L, attributes.getSize()); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SFTPFindFeature(session).find(vault)); assertFalse(new SFTPFindFeature(session).find(cryptomator.getHome())); assertFalse(new SFTPFindFeature(session).find(cryptomator.getMasterkey())); @@ -92,7 +92,7 @@ public class SFTPAttributesFinderFeatureTest extends AbstractSFTPTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session)).find(test); assertNotNull(attributes); assertEquals(0L, attributes.getSize()); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,6 +115,6 @@ public class SFTPAttributesFinderFeatureTest extends AbstractSFTPTest { assertNotNull(attributes); assertEquals(0L, attributes.getSize()); assertEquals(0L, cache.get(vault).get(0).attributes().getSize()); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java index d4aaf91ffd..02e57e2168 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java @@ -19,10 +19,10 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Factory; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -140,8 +140,8 @@ public class SFTPCryptomatorInteroperabilityTest { // read with Cyberduck and compare final Host host = new Host(new SFTPProtocol(), "localhost", PORT_NUMBER, new Credentials("empty", "empty")); final SFTPSession session = new SFTPSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, "vault", EnumSet.of(Path.Type.directory)); final CryptoVault cryptomator = new CryptoVault(vault).load(session, new DisabledPasswordCallback() { @@ -174,8 +174,8 @@ public class SFTPCryptomatorInteroperabilityTest { // read with Cyberduck and compare final Host host = new Host(new SFTPProtocol(), "localhost", PORT_NUMBER, new Credentials("empty", "empty")); final SFTPSession session = new SFTPSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, "vault", EnumSet.of(Path.Type.directory)); final CryptoVault cryptomator = new CryptoVault(vault).load(session, new DisabledPasswordCallback() { diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPDirectoryFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPDirectoryFeatureTest.java index c5e2acc351..c26334756b 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPDirectoryFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPDirectoryFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Directory; @@ -62,7 +62,7 @@ public class SFTPDirectoryFeatureTest extends AbstractSFTPTest { cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(test)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -77,6 +77,6 @@ public class SFTPDirectoryFeatureTest extends AbstractSFTPTest { cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir(new SFTPWriteFeature(session), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(test)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPFindFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPFindFeatureTest.java index 0f2735a857..481c767273 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPFindFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPFindFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -63,7 +63,7 @@ public class SFTPFindFeatureTest extends AbstractSFTPTest { new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -79,6 +79,6 @@ public class SFTPFindFeatureTest extends AbstractSFTPTest { new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPListServiceTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPListServiceTest.java index f1a060a895..be1a199b15 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPListServiceTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPListServiceTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.Cache; import ch.cyberduck.core.CachingFindFeature; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.cryptomator.features.CryptoFindFeature; @@ -101,6 +101,6 @@ public class SFTPListServiceTest extends AbstractSFTPTest { assertTrue(f.getType().contains(Path.Type.decrypted)); } } - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPMoveFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPMoveFeatureTest.java index 94139dc761..08b7ed7104 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPMoveFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPMoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -75,7 +75,7 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { cryptomator.getFeature(session, Move.class, new SFTPMoveFeature(session)).move(source, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @@ -98,7 +98,7 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { cryptomator.getFeature(session, Move.class, new SFTPMoveFeature(session)).move(source, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @@ -122,7 +122,7 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { cryptomator.getFeature(session, Move.class, new SFTPMoveFeature(session)).move(source, target, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(target, targetFolder, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -148,7 +148,7 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { assertFalse(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(file)); assertEquals(fileRenamed.attributes(), cryptomator.getFeature(session, AttributesFinder.class, new SFTPAttributesFinderFeature(session)).find(fileRenamed)); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(fileRenamed)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(fileRenamed, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(fileRenamed, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -168,7 +168,7 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { move.move(folder, folderRenamed, new TransferStatus(), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(folder)); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(folderRenamed)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Collections.singletonList(folderRenamed), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Collections.singletonList(folderRenamed), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -199,6 +199,6 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(fileRenamedInRenamedFolder)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPReadFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPReadFeatureTest.java index 72b0180164..6ba12b2fb8 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPReadFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPReadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.features.CryptoListService; @@ -95,7 +95,7 @@ public class SFTPReadFeatureTest extends AbstractSFTPTest { final byte[] reference = new byte[30000]; System.arraycopy(content, 40000, reference, 0, reference.length); assertArrayEquals(reference, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPSymlinkFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPSymlinkFeatureTest.java index 7a74f516b4..132f70547c 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPSymlinkFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPSymlinkFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoSymlinkFeature; @@ -72,9 +72,9 @@ public class SFTPSymlinkFeatureTest extends AbstractSFTPTest { assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(link)); assertEquals(EnumSet.of(Path.Type.file, Path.Type.symboliclink, Path.Type.decrypted), new CryptoListService(session, new SFTPListService(session), cryptomator).list(vault, new DisabledListProgressListener()).get(link).getType()); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Collections.singletonList(link), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Collections.singletonList(link), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(link)); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(target)); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPWriteFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPWriteFeatureTest.java index a91d8fd5a7..51f5c45b7a 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPWriteFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPWriteFeatureTest.java @@ -21,8 +21,8 @@ import ch.cyberduck.core.Cache; import ch.cyberduck.core.CachingAttributesFinderFeature; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -96,7 +96,7 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { final InputStream in = new CryptoReadFeature(session, new SFTPReadFeature(session), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -145,6 +145,6 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { final InputStream in = new CryptoReadFeature(session, new SFTPReadFeature(session), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new SFTPDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPCompressFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPCompressFeatureTest.java index c209786008..7c2d661b40 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPCompressFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPCompressFeatureTest.java @@ -1,8 +1,8 @@ package ch.cyberduck.core.sftp; import ch.cyberduck.core.Archive; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledTranscriptListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -39,7 +39,7 @@ public class SFTPCompressFeatureTest extends AbstractSFTPTest { } }, new DisabledTranscriptListener()); assertTrue(new SFTPFindFeature(session).find(archive.getArchive(Collections.singletonList(test)))); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SFTPFindFeature(session).find(test)); feature.unarchive(archive, archive.getArchive(Collections.singletonList(test)), new ProgressListener() { @@ -51,8 +51,8 @@ public class SFTPCompressFeatureTest extends AbstractSFTPTest { assertTrue(new SFTPFindFeature(session).find(test)); new SFTPDeleteFeature(session).delete(Collections.singletonList(archive.getArchive( Collections.singletonList(test) - )), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), + )), LoginCallback.noop, new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPDeleteFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPDeleteFeatureTest.java index 84e700042a..77f7790f40 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPDeleteFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPDeleteFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.sftp; * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -41,7 +41,7 @@ public class SFTPDeleteFeatureTest extends AbstractSFTPTest { public void testDeleteNotFound() throws Exception { final Path test = new Path(new SFTPHomeDirectoryService(session).find(), "t", EnumSet.of(Path.Type.file)); try { - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } catch(NotfoundException e) { assertEquals("Cannot delete t.", e.getMessage()); @@ -58,6 +58,6 @@ public class SFTPDeleteFeatureTest extends AbstractSFTPTest { new SFTPTouchFeature(session).touch(new SFTPWriteFeature(session), file, new TransferStatus()); final Path subdir = new Path(folder, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new SFTPDirectoryFeature(session).mkdir(new SFTPWriteFeature(session), subdir, new TransferStatus()); - new SFTPDeleteFeature(session).delete(Arrays.asList(subdir, file, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(subdir, file, folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPDirectoryFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPDirectoryFeatureTest.java index 13e97c60c0..3bd7876c61 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPDirectoryFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPDirectoryFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.sftp; * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -43,6 +43,6 @@ public class SFTPDirectoryFeatureTest extends AbstractSFTPTest { new SFTPDirectoryFeature(session).mkdir(new SFTPWriteFeature(session), test, new TransferStatus()); assertTrue(new SFTPFindFeature(session).find(test)); assertThrows(ConflictException.class, () -> new SFTPDirectoryFeature(session).mkdir(new SFTPWriteFeature(session), test, new TransferStatus())); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPFindFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPFindFeatureTest.java index 70fd7eb6ac..22ad4145c4 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPFindFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPFindFeatureTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.sftp; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -36,7 +36,7 @@ public class SFTPFindFeatureTest extends AbstractSFTPTest { new SFTPTouchFeature(session).touch(new SFTPWriteFeature(session), file, new TransferStatus()); assertTrue(new SFTPFindFeature(session).find(file)); assertFalse(new SFTPFindFeature(session).find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))); - new SFTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPListServiceTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPListServiceTest.java index e395961afc..80109844e8 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPListServiceTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPListServiceTest.java @@ -21,7 +21,7 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Permission; import ch.cyberduck.core.exception.NotfoundException; @@ -66,7 +66,7 @@ public class SFTPListServiceTest extends AbstractSFTPTest { assertEquals(file, list.get(symlinkRelative).getSymlinkTarget()); assertTrue(list.contains(symlinkAbsolute)); assertEquals(file, list.get(symlinkAbsolute).getSymlinkTarget()); - new SFTPDeleteFeature(session).delete(Arrays.asList(file, symlinkAbsolute, symlinkRelative, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(file, symlinkAbsolute, symlinkRelative, directory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -78,7 +78,7 @@ public class SFTPListServiceTest extends AbstractSFTPTest { final AttributedList list = new SFTPListService(session).list(home, new DisabledListProgressListener()); assertTrue(list.contains(file)); assertEquals(new Path(home, target, EnumSet.of(Path.Type.file)), list.get(file).getSymlinkTarget()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPMoveFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPMoveFeatureTest.java index aa99bcc8d5..fd46f06654 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPMoveFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPMoveFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.sftp; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.exception.NotfoundException; @@ -48,7 +48,7 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { assertFalse(new SFTPFindFeature(session).find(test)); assertTrue(new SFTPFindFeature(session).find(target)); assertEquals(test.attributes(), target.attributes()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -62,7 +62,7 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { new SFTPMoveFeature(session).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new SFTPFindFeature(session).find(test)); assertTrue(new SFTPFindFeature(session).find(target)); - new SFTPDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPReadFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPReadFeatureTest.java index 74a3aeedd8..753a3b63f2 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPReadFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPReadFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.sftp; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -74,7 +74,7 @@ public class SFTPReadFeatureTest extends AbstractSFTPTest { in.close(); assertArrayEquals(content, buffer.toByteArray()); } - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -105,7 +105,7 @@ public class SFTPReadFeatureTest extends AbstractSFTPTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); } - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPSessionTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPSessionTest.java index d1978dad75..c1fcb2bcd2 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPSessionTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPSessionTest.java @@ -7,6 +7,7 @@ import ch.cyberduck.core.DisabledPasswordStore; import ch.cyberduck.core.Host; import ch.cyberduck.core.HostKeyCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.NullLocal; @@ -68,7 +69,7 @@ public class SFTPSessionTest extends AbstractSFTPTest { for(net.schmizz.sshj.common.Factory.Named mac : defaultConfig.getMACFactories()) { final DefaultConfig configuration = new DefaultConfig(); configuration.setMACFactories(Collections.singletonList(mac)); - final SSHClient client = session.connect(new DisabledHostKeyCallback(), new DisabledLoginCallback(), configuration); + final SSHClient client = session.connect(new DisabledHostKeyCallback(), LoginCallback.noop, configuration); assertTrue(client.isConnected()); client.close(); } @@ -78,7 +79,7 @@ public class SFTPSessionTest extends AbstractSFTPTest { public void testAES256CTRCipher() throws Exception { final DefaultConfig configuration = new DefaultConfig(); configuration.setCipherFactories(Collections.singletonList(new AES256CTR.Factory())); - final SSHClient client = session.connect(new DisabledHostKeyCallback(), new DisabledLoginCallback(), configuration); + final SSHClient client = session.connect(new DisabledHostKeyCallback(), LoginCallback.noop, configuration); assertTrue(client.isConnected()); client.close(); } @@ -87,7 +88,7 @@ public class SFTPSessionTest extends AbstractSFTPTest { public void testECDHNistPKeyExchange() throws Exception { final DefaultConfig configuration = new DefaultConfig(); configuration.setKeyExchangeFactories(Collections.singletonList(new ECDHNistP.Factory256())); - final SSHClient client = session.connect(new DisabledHostKeyCallback(), new DisabledLoginCallback(), configuration); + final SSHClient client = session.connect(new DisabledHostKeyCallback(), LoginCallback.noop, configuration); assertTrue(client.isConnected()); client.close(); } @@ -133,7 +134,7 @@ public class SFTPSessionTest extends AbstractSFTPTest { System.getProperties().getProperty("sftp.user"), System.getProperties().getProperty("sftp.password") )); final SFTPSession session = new SFTPSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop)); + assertNotNull(session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop)); new SFTPHomeDirectoryService(session).find(); } @@ -163,7 +164,7 @@ public class SFTPSessionTest extends AbstractSFTPTest { verify.set(true); throw new ConnectionCanceledException(); } - }, new DisabledLoginCallback(), CancelCallback.noop); + }, LoginCallback.noop, CancelCallback.noop); } catch(Exception e) { assertTrue(verify.get()); @@ -276,7 +277,7 @@ public class SFTPSessionTest extends AbstractSFTPTest { fail(); return false; } - }, new DisabledLoginCallback(), CancelCallback.noop)); + }, LoginCallback.noop, CancelCallback.noop)); session.close(); assertNotNull(session.open(new DisabledProxyFinder(), new OpenSSHHostKeyVerifier(f) { @Override @@ -294,7 +295,7 @@ public class SFTPSessionTest extends AbstractSFTPTest { protected boolean isChangedKeyAccepted(final Host hostname, final PublicKey key) { return false; } - }, new DisabledLoginCallback(), CancelCallback.noop)); + }, LoginCallback.noop, CancelCallback.noop)); session.close(); } finally { diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPSymlinkFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPSymlinkFeatureTest.java index 4a99775fa6..5f6e4c26b5 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPSymlinkFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPSymlinkFeatureTest.java @@ -3,7 +3,7 @@ package ch.cyberduck.core.sftp; import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -30,9 +30,9 @@ public class SFTPSymlinkFeatureTest extends AbstractSFTPTest { assertTrue(new SFTPFindFeature(session).find(link)); assertEquals(EnumSet.of(Path.Type.file, AbstractPath.Type.symboliclink), new SFTPListService(session).list(workdir.find(), new DisabledListProgressListener()).get(link).getType()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(link), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(link), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new SFTPFindFeature(session).find(link)); assertTrue(new SFTPFindFeature(session).find(target)); - new SFTPDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPTimestampFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPTimestampFeatureTest.java index e39ea96e4f..c54db3785c 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPTimestampFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPTimestampFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.sftp; */ import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultAttributesFinderFeature; @@ -47,7 +47,7 @@ public class SFTPTimestampFeatureTest extends AbstractSFTPTest { new SFTPTimestampFeature(session).setTimestamp(test, modified); assertEquals(TimeUnit.SECONDS.toMillis(TimeUnit.MILLISECONDS.toSeconds(modified)), new SFTPAttributesFinderFeature(session).find(test).getModificationDate()); assertEquals(TimeUnit.SECONDS.toMillis(TimeUnit.MILLISECONDS.toSeconds(modified)), new DefaultAttributesFinderFeature(session).find(test).getModificationDate()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @@ -59,7 +59,7 @@ public class SFTPTimestampFeatureTest extends AbstractSFTPTest { final long modified = System.currentTimeMillis(); new SFTPTimestampFeature(session).setTimestamp(test, modified); assertEquals(TimeUnit.SECONDS.toMillis(TimeUnit.MILLISECONDS.toSeconds(modified)), new SFTPListService(session).list(home, new DisabledListProgressListener()).get(test).attributes().getModificationDate(), 0); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPTouchFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPTouchFeatureTest.java index bf4ede50b0..835ec475b3 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPTouchFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPTouchFeatureTest.java @@ -20,7 +20,7 @@ package ch.cyberduck.core.sftp; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Permission; import ch.cyberduck.core.features.Delete; @@ -50,6 +50,6 @@ public class SFTPTouchFeatureTest extends AbstractSFTPTest { final AttributedList list = new SFTPListService(session).list(home, new DisabledListProgressListener()); assertTrue(list.contains(test)); assertEquals("664", list.get(test).attributes().getPermission().getMode()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPUnixPermissionFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPUnixPermissionFeatureTest.java index 7dc8064423..ecda9bddb0 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPUnixPermissionFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPUnixPermissionFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.sftp; */ import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Permission; import ch.cyberduck.core.features.Delete; @@ -66,14 +66,14 @@ public class SFTPUnixPermissionFeatureTest extends AbstractSFTPTest { new SFTPTouchFeature(session).touch(new SFTPWriteFeature(session), file, new TransferStatus()); new SFTPUnixPermissionFeature(session).setUnixPermission(file, new Permission(666)); assertEquals("666", new SFTPListService(session).list(home, new DisabledListProgressListener()).get(file).attributes().getPermission().getMode()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } { final Path directory = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); new SFTPDirectoryFeature(session).mkdir(new SFTPWriteFeature(session), directory, new TransferStatus()); new SFTPUnixPermissionFeature(session).setUnixPermission(directory, new Permission(666)); assertEquals("666", new SFTPListService(session).list(home, new DisabledListProgressListener()).get(directory).attributes().getPermission().getMode()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(directory), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -101,6 +101,6 @@ public class SFTPUnixPermissionFeatureTest extends AbstractSFTPTest { assertEquals(new Permission(Permission.Action.all, Permission.Action.read, Permission.Action.read, false, false, true), new SFTPListService(session).list(test.getParent(), new DisabledListProgressListener()).get( test).attributes().getPermission()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPUploadFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPUploadFeatureTest.java index 13603d2b9d..ce08428d23 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPUploadFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPUploadFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.sftp; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.transfer.TransferStatus; @@ -36,7 +36,7 @@ public class SFTPUploadFeatureTest extends AbstractSFTPTest { final Path test = new Path(workdir, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new SFTPTouchFeature(session).touch(new SFTPWriteFeature(session), test, new TransferStatus()); assertTrue(new SFTPUploadFeature(session).append(test, new TransferStatus().setExists(true).setLength(1L).setRemote(new SFTPAttributesFinderFeature(session).find(test))).append); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPWriteFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPWriteFeatureTest.java index 99909744d0..1d1600a265 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPWriteFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/SFTPWriteFeatureTest.java @@ -5,7 +5,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -64,7 +64,7 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { System.arraycopy(content, 1, reference, 0, content.length - 1); assertArrayEquals(reference, buffer.toByteArray()); } - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @@ -101,7 +101,7 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { System.arraycopy(content, 1, reference, 0, content.length - 1); assertArrayEquals(reference, buffer.toByteArray()); } - new SFTPDeleteFeature(session).delete(Arrays.asList(test, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(test, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -138,7 +138,7 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { final AttributedList list = new SFTPListService(session).list(workdir, new DisabledListProgressListener()); assertTrue(list.contains(new Path(workdir, name, EnumSet.of(Path.Type.file)))); assertFalse(list.contains(symlink)); - new SFTPDeleteFeature(session).delete(Arrays.asList(target, symlink), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(target, symlink), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) @@ -178,7 +178,7 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); IOUtils.copy(new SFTPReadFeature(session).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out); assertArrayEquals(content, out.toByteArray()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -216,7 +216,7 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { assertArrayEquals(content, out.toByteArray()); assertTrue(new DefaultFindFeature(session).find(test)); assertEquals(content.length, new DefaultAttributesFinderFeature(session).find(test).getSize()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPChallengeResponseAuthenticationTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPChallengeResponseAuthenticationTest.java index f45d1ff06e..83d343da64 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPChallengeResponseAuthenticationTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPChallengeResponseAuthenticationTest.java @@ -15,7 +15,7 @@ package ch.cyberduck.core.sftp.auth; * GNU General Public License for more details. */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.exception.LoginFailureException; import ch.cyberduck.core.sftp.AbstractSFTPTest; import ch.cyberduck.core.threading.CancelCallback; @@ -33,6 +33,6 @@ public class SFTPChallengeResponseAuthenticationTest extends AbstractSFTPTest { @Test(expected = LoginFailureException.class) @Ignore public void testAuthenticate() throws Exception { - assertFalse(new SFTPChallengeResponseAuthentication(session.getClient()).authenticate(session.getHost(), new DisabledLoginCallback(), CancelCallback.noop)); + assertFalse(new SFTPChallengeResponseAuthentication(session.getClient()).authenticate(session.getHost(), LoginCallback.noop, CancelCallback.noop)); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPNoneAuthenticationTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPNoneAuthenticationTest.java index 969bfa4c38..0e8dc39f60 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPNoneAuthenticationTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPNoneAuthenticationTest.java @@ -15,7 +15,7 @@ package ch.cyberduck.core.sftp.auth; * GNU General Public License for more details. */ -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.exception.LoginFailureException; import ch.cyberduck.core.sftp.AbstractSFTPTest; import ch.cyberduck.core.threading.CancelCallback; @@ -33,6 +33,6 @@ public class SFTPNoneAuthenticationTest extends AbstractSFTPTest { @Test(expected = LoginFailureException.class) @Ignore public void testAuthenticate() throws Exception { - assertFalse(new SFTPNoneAuthentication(session.getClient()).authenticate(session.getHost(), new DisabledLoginCallback(), CancelCallback.noop)); + assertFalse(new SFTPNoneAuthentication(session.getClient()).authenticate(session.getHost(), LoginCallback.noop, CancelCallback.noop)); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPPasswordAuthenticationTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPPasswordAuthenticationTest.java index a6d1f6b504..b10bc7a291 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPPasswordAuthenticationTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPPasswordAuthenticationTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.sftp.auth; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.exception.LoginFailureException; import ch.cyberduck.core.proxy.DisabledProxyFinder; import ch.cyberduck.core.sftp.AbstractSFTPTest; @@ -35,8 +35,8 @@ public class SFTPPasswordAuthenticationTest extends AbstractSFTPTest { public void testAuthenticateFailure() throws Exception { // Reconnect session.disconnect(); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); session.getHost().getCredentials().setPassword("p"); - assertFalse(new SFTPPasswordAuthentication(session.getClient()).authenticate(session.getHost(), new DisabledLoginCallback(), CancelCallback.noop)); + assertFalse(new SFTPPasswordAuthentication(session.getClient()).authenticate(session.getHost(), LoginCallback.noop, CancelCallback.noop)); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPPublicKeyAuthenticationTest.java b/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPPublicKeyAuthenticationTest.java index e046a37865..548a1b8f41 100644 --- a/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPPublicKeyAuthenticationTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/sftp/auth/SFTPPublicKeyAuthenticationTest.java @@ -20,6 +20,7 @@ import ch.cyberduck.core.DisabledHostKeyCallback; import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.exception.LoginCanceledException; import ch.cyberduck.core.local.DefaultLocalTouchFeature; @@ -147,7 +148,7 @@ public class SFTPPublicKeyAuthenticationTest extends AbstractSFTPTest { "-----END RSA PRIVATE KEY-----\n"), key.getOutputStream(false), StandardCharsets.UTF_8); // Reconnect session.disconnect(); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); final AtomicBoolean p = new AtomicBoolean(); session.getHost().getCredentials().setIdentity(key); assertFalse(new SFTPPublicKeyAuthentication(session.getClient()).authenticate(session.getHost(), new DisabledLoginCallback() { @@ -203,7 +204,7 @@ public class SFTPPublicKeyAuthenticationTest extends AbstractSFTPTest { final AtomicBoolean b = new AtomicBoolean(); // Reconnect session.disconnect(); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); session.getHost().getCredentials().setIdentity(key); assertTrue(new SFTPPublicKeyAuthentication(session.getClient()).authenticate(session.getHost(), new DisabledLoginCallback() { @Override @@ -228,7 +229,7 @@ public class SFTPPublicKeyAuthenticationTest extends AbstractSFTPTest { IOUtils.copy(new StringReader("--unknown format"), key.getOutputStream(false), StandardCharsets.UTF_8); // Reconnect session.disconnect(); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); session.getHost().getCredentials().setIdentity(key); assertFalse(new SFTPPublicKeyAuthentication(session.getClient()).authenticate(session.getHost(), new DisabledLoginCallback() { @Override diff --git a/ssh/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java index 0eaf36eeb8..51f3757b1c 100644 --- a/ssh/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java @@ -4,8 +4,8 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Attributes; import ch.cyberduck.core.CachingAttributesFinderFeature; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -85,6 +85,6 @@ public class CachingAttributesFinderFeatureTest extends AbstractSFTPTest { return newAttr; } }).find(file)); - new SFTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java index 93a31464d3..d9bee934b0 100644 --- a/ssh/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java @@ -2,7 +2,7 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Attributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.Permission; import ch.cyberduck.core.exception.NotfoundException; @@ -53,6 +53,6 @@ public class DefaultAttributesFinderFeatureTest extends AbstractSFTPTest { catch(NotfoundException e) { // Expected } - new SFTPDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/shared/DefaultCopyFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/shared/DefaultCopyFeatureTest.java index f9ee50e520..5e4b74b0fd 100644 --- a/ssh/src/test/java/ch/cyberduck/core/shared/DefaultCopyFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/shared/DefaultCopyFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.io.StreamCopier; @@ -67,6 +67,6 @@ public class DefaultCopyFeatureTest extends AbstractSFTPTest { assertTrue(new DefaultFindFeature(session).find(source)); assertTrue(new DefaultFindFeature(session).find(target)); assertEquals(content.length, new DefaultAttributesFinderFeature(session).find(target).getSize()); - new SFTPDeleteFeature(session).delete(Arrays.asList(source, target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(source, target), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java index c3a751e541..43f71676ce 100644 --- a/ssh/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/shared/DefaultDownloadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.shared; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Touch; @@ -85,7 +85,7 @@ public class DefaultDownloadFeatureTest extends AbstractSFTPTest { in.close(); assertArrayEquals(content, buffer); final Delete delete = session.getFeature(Delete.class); - delete.delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -115,6 +115,6 @@ public class DefaultDownloadFeatureTest extends AbstractSFTPTest { in.close(); assertArrayEquals(content, buffer); final Delete delete = session.getFeature(Delete.class); - delete.delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/shared/DefaultUploadFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/shared/DefaultUploadFeatureTest.java index 838d6a43e1..15a32cc424 100644 --- a/ssh/src/test/java/ch/cyberduck/core/shared/DefaultUploadFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/shared/DefaultUploadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.shared; */ import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.features.Delete; @@ -78,7 +78,7 @@ public class DefaultUploadFeatureTest extends AbstractSFTPTest { in.close(); assertArrayEquals(content, buffer); final Delete delete = session.getFeature(Delete.class); - delete.delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + delete.delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java b/ssh/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java index 230c9b962c..0d4102d525 100644 --- a/ssh/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -54,7 +54,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { worker.run(session); assertTrue(new SFTPFindFeature(session).find(source)); assertTrue(new SFTPFindFeature(session).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(source, target), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(source, target), ProgressListener.noop).run(session); } @Test @@ -72,7 +72,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { worker.run(session); assertTrue(new SFTPFindFeature(session).find(sourceFile)); assertTrue(new SFTPFindFeature(session).find(targetFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); } @Test @@ -90,7 +90,7 @@ public class CopyWorkerTest extends AbstractSFTPTest { assertTrue(new SFTPFindFeature(session).find(targetFile)); assertTrue(new SFTPFindFeature(session).find(folder)); assertTrue(new SFTPFindFeature(session).find(sourceFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(folder, targetFile), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(folder, targetFile), ProgressListener.noop).run(session); } } diff --git a/ssh/src/test/java/ch/cyberduck/core/worker/SFTPSingleTransferWorkerTest.java b/ssh/src/test/java/ch/cyberduck/core/worker/SFTPSingleTransferWorkerTest.java index 617f4f71e8..15d0de38a4 100644 --- a/ssh/src/test/java/ch/cyberduck/core/worker/SFTPSingleTransferWorkerTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/worker/SFTPSingleTransferWorkerTest.java @@ -20,10 +20,10 @@ import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordStore; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -134,7 +134,7 @@ public class SFTPSingleTransferWorkerTest extends AbstractSFTPTest { return super._getFeature(type); } }; - new LoginConnectionService(new DisabledLoginCallback(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop).connect(session, CancelCallback.noop); @@ -146,7 +146,7 @@ public class SFTPSingleTransferWorkerTest extends AbstractSFTPTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); local.delete(); @@ -157,7 +157,7 @@ public class SFTPSingleTransferWorkerTest extends AbstractSFTPTest { assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); assertTrue(failed.get()); - new SFTPDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -181,7 +181,7 @@ public class SFTPSingleTransferWorkerTest extends AbstractSFTPTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); local.delete(); @@ -191,7 +191,7 @@ public class SFTPSingleTransferWorkerTest extends AbstractSFTPTest { assertEquals(t.getTransferred(), counter.getSent(), 0L); assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); - new SFTPDeleteFeature(session).delete(Arrays.asList(remotefile, remotedirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(remotefile, remotedirectory), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -219,7 +219,7 @@ public class SFTPSingleTransferWorkerTest extends AbstractSFTPTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, counter, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, counter, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); local.delete(); @@ -229,6 +229,6 @@ public class SFTPSingleTransferWorkerTest extends AbstractSFTPTest { assertEquals(t.getTransferred(), counter.getSent(), 0L); assertEquals(content.length, counter.getRecv(), 0L); assertEquals(content.length, counter.getSent(), 0L); - new SFTPDeleteFeature(session).delete(Arrays.asList(remotefile, remotedirectory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new SFTPDeleteFeature(session).delete(Arrays.asList(remotefile, remotedirectory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateAttributesFinderFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateAttributesFinderFeatureTest.java index 39448b91fb..72bffaf399 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateAttributesFinderFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateAttributesFinderFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.storegate; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -99,6 +99,6 @@ public class StoregateAttributesFinderFeatureTest extends AbstractStoregateTest nodeid.cache(test, String.valueOf(RandomUtils.nextLong())); final StoregateAttributesFinderFeature f = new StoregateAttributesFinderFeature(session, nodeid); assertEquals(latestnodeid, f.find(test).getFileId()); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateCopyFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateCopyFeatureTest.java index bd92daa7e4..1197e7343d 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateCopyFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateCopyFeatureTest.java @@ -19,7 +19,7 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Find; @@ -55,7 +55,7 @@ public class StoregateCopyFeatureTest extends AbstractStoregateTest { assertNotEquals(test.attributes().getFileId(), new StoregateCopyFeature(session, nodeid).copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop).attributes().getFileId()); assertTrue(new DefaultFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(copy)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -68,7 +68,7 @@ public class StoregateCopyFeatureTest extends AbstractStoregateTest { assertNotEquals(test.attributes().getFileId(), new StoregateCopyFeature(session, fileid).copy(test, copy, new TransferStatus(), ConnectionCallback.noop, StreamListener.noop).attributes().getFileId()); assertTrue(new DefaultFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(copy)); - new StoregateDeleteFeature(session, fileid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, fileid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -89,7 +89,7 @@ public class StoregateCopyFeatureTest extends AbstractStoregateTest { final Find find = new DefaultFindFeature(session); final AttributedList files = new StoregateListService(session, fileid).list(targetFolder, new DisabledListProgressListener()); assertTrue(find.find(copy)); - new StoregateDeleteFeature(session, fileid).delete(Collections.singletonList(top), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, fileid).delete(Collections.singletonList(top), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -106,7 +106,7 @@ public class StoregateCopyFeatureTest extends AbstractStoregateTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(test2)); - new StoregateDeleteFeature(session, fileid).delete(Collections.singletonList(top), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, fileid).delete(Collections.singletonList(top), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -127,7 +127,7 @@ public class StoregateCopyFeatureTest extends AbstractStoregateTest { assertTrue(new DefaultFindFeature(session).find(file)); assertTrue(new DefaultFindFeature(session).find(target)); assertTrue(new DefaultFindFeature(session).find(copy)); - new StoregateDeleteFeature(session, fileid).delete(Collections.singletonList(top), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, fileid).delete(Collections.singletonList(top), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateDeleteFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateDeleteFeatureTest.java index 240cc672e4..61c61d13d0 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateDeleteFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateDeleteFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.storegate; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -44,7 +44,7 @@ public class StoregateDeleteFeatureTest extends AbstractStoregateTest { final Path fileInRoom = new Path(room, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new StoregateTouchFeature(session, nodeid).touch(new StoregateWriteFeature(session, nodeid), fileInRoom, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(fileInRoom)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInRoom), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInRoom), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(fileInRoom)); } @@ -56,7 +56,7 @@ public class StoregateDeleteFeatureTest extends AbstractStoregateTest { new StoregateTouchFeature(session, nodeid).touch(new StoregateWriteFeature(session, nodeid), fileInRoom, new TransferStatus()); final String lock = new StoregateLockFeature(session, nodeid).lock(fileInRoom); assertTrue(new DefaultFindFeature(session).find(fileInRoom)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonMap(fileInRoom, new TransferStatus().setLockId(lock)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonMap(fileInRoom, new TransferStatus().setLockId(lock)), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(fileInRoom)); } @@ -71,15 +71,15 @@ public class StoregateDeleteFeatureTest extends AbstractStoregateTest { final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new StoregateTouchFeature(session, nodeid).touch(new StoregateWriteFeature(session, nodeid), file, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(file)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(folder)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(room)); } @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(String.format("/My files/%s", UUID.randomUUID().toString()), EnumSet.of(Path.Type.file)); - new StoregateDeleteFeature(session, new StoregateIdProvider(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, new StoregateIdProvider(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateDirectoryFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateDirectoryFeatureTest.java index 4a3cc597d0..d7bf2c83e7 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateDirectoryFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateDirectoryFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.storegate; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultFindFeature; @@ -43,7 +43,7 @@ public class StoregateDirectoryFeatureTest extends AbstractStoregateTest { assertTrue(new StoregateFindFeature(session, nodeid).find(folder)); // Can create again regardless if exists new StoregateDirectoryFeature(session, nodeid).mkdir(new StoregateWriteFeature(session, nodeid), folder, new TransferStatus()); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(folder)); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateIdProviderTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateIdProviderTest.java index 465a8977a9..ebdce16802 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateIdProviderTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateIdProviderTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.storegate; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.NotfoundException; @@ -57,6 +57,6 @@ public class StoregateIdProviderTest extends AbstractStoregateTest { catch(NotfoundException e) { // Expected } - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } \ No newline at end of file diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateListServiceTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateListServiceTest.java index d720171d77..6bbf0c4790 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateListServiceTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateListServiceTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.AbstractPath; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.AttributedList; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.IndexedListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.SimplePathPredicate; @@ -94,7 +94,7 @@ public class StoregateListServiceTest extends AbstractStoregateTest { assertSame(folder, list.get(file).getParent()); assertTrue(list.get(file).attributes().isHidden()); assertSame(folder, list.get(file).getParent()); - new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(file, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(file, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -121,7 +121,7 @@ public class StoregateListServiceTest extends AbstractStoregateTest { }); assertNotSame(AttributedList.emptyList(), list); assertTrue(list.isEmpty()); - new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(file, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(file, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -138,6 +138,6 @@ public class StoregateListServiceTest extends AbstractStoregateTest { } }).isEmpty()); assertTrue(callback.get()); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateLockFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateLockFeatureTest.java index 18eca90358..6b7041fead 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateLockFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateLockFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.storegate; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.LockedException; import ch.cyberduck.core.features.Delete; @@ -46,15 +46,15 @@ public class StoregateLockFeatureTest extends AbstractStoregateTest { final String lock = new StoregateLockFeature(session, nodeid).lock(fileInRoom); assertNotNull(lock); try { - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInRoom), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInRoom), LoginCallback.noop, new Delete.DisabledCallback()); fail(); } catch(LockedException e) { // expected } new StoregateLockFeature(session, nodeid).unlock(fileInRoom, lock); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInRoom), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(fileInRoom), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DefaultFindFeature(session).find(fileInRoom)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateMoveFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateMoveFeatureTest.java index a28eb47304..99c40f8675 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateMoveFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateMoveFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.storegate; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Copy; @@ -56,7 +56,7 @@ public class StoregateMoveFeatureTest extends AbstractStoregateTest { assertTrue(new DefaultFindFeature(session).find(target)); assertEquals(0, session.getMetrics().get(Copy.class)); assertEquals(Comparison.equal, session.getHost().getProtocol().getFeature(ComparisonService.class).compare(Path.Type.file, test.attributes(), new StoregateAttributesFinderFeature(session, nodeid).find(target))); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -74,7 +74,7 @@ public class StoregateMoveFeatureTest extends AbstractStoregateTest { assertFalse(new DefaultFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(target)); assertEquals(0, session.getMetrics().get(Copy.class)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -93,7 +93,7 @@ public class StoregateMoveFeatureTest extends AbstractStoregateTest { assertFalse(new DefaultFindFeature(session).find(test)); assertTrue(new DefaultFindFeature(session).find(target)); assertEquals(0, session.getMetrics().get(Copy.class)); - new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(folder1, folder2), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(folder1, folder2), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -110,7 +110,7 @@ public class StoregateMoveFeatureTest extends AbstractStoregateTest { assertEquals(0, session.getMetrics().get(Copy.class)); assertFalse(new DefaultFindFeature(session).find(new Path(room, foldername, EnumSet.of(Path.Type.directory)))); assertTrue(new DefaultFindFeature(session).find(target)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -126,7 +126,7 @@ public class StoregateMoveFeatureTest extends AbstractStoregateTest { new StoregateMoveFeature(session, nodeid).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new DefaultFindFeature(session).find(new Path(room, filename, EnumSet.of(Path.Type.file)))); assertTrue(new DefaultFindFeature(session).find(target)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -142,7 +142,7 @@ public class StoregateMoveFeatureTest extends AbstractStoregateTest { new StoregateMoveFeature(session, nodeid).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new DefaultFindFeature(session).find(new Path(room, filename, EnumSet.of(Path.Type.file)))); assertTrue(new DefaultFindFeature(session).find(target)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateMultipartWriteFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateMultipartWriteFeatureTest.java index 93e23d4cb8..334ad1deb8 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateMultipartWriteFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateMultipartWriteFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.storegate; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConnectionCanceledException; import ch.cyberduck.core.exception.LockedException; @@ -72,7 +72,7 @@ public class StoregateMultipartWriteFeatureTest extends AbstractStoregateTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -100,7 +100,7 @@ public class StoregateMultipartWriteFeatureTest extends AbstractStoregateTest { new StreamCopier(status, status).transfer(new ByteArrayInputStream(content), out); out.close(); new StoregateLockFeature(session, nodeid).unlock(test, lockId); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = TransferStatusCanceledException.class) @@ -148,7 +148,7 @@ public class StoregateMultipartWriteFeatureTest extends AbstractStoregateTest { assertNotNull(version); assertTrue(new StoregateFindFeature(session, nodeid).find(test)); assertEquals(content.length, new StoregateAttributesFinderFeature(session, nodeid).find(test).getSize()); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -169,7 +169,7 @@ public class StoregateMultipartWriteFeatureTest extends AbstractStoregateTest { assertNotNull(version); assertTrue(new StoregateFindFeature(session, nodeid).find(test)); assertEquals(content.length, new StoregateAttributesFinderFeature(session, nodeid).find(test).getSize()); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -189,6 +189,6 @@ public class StoregateMultipartWriteFeatureTest extends AbstractStoregateTest { assertNotNull(version); assertTrue(new StoregateFindFeature(session, nodeid).find(test)); assertEquals(0L, new StoregateAttributesFinderFeature(session, nodeid).find(test).getSize()); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateReadFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateReadFeatureTest.java index 116903924d..4cdf42cc63 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateReadFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateReadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.storegate; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.exception.NotfoundException; @@ -61,7 +61,7 @@ public class StoregateReadFeatureTest extends AbstractStoregateTest { new StoregateReadFeature(session, nodeid).read(new Path(room, "nosuchname", EnumSet.of(Path.Type.file)), status, ConnectionCallback.noop); } finally { - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -92,7 +92,7 @@ public class StoregateReadFeatureTest extends AbstractStoregateTest { assertNotNull(in); in.close(); } - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -126,7 +126,7 @@ public class StoregateReadFeatureTest extends AbstractStoregateTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -160,7 +160,7 @@ public class StoregateReadFeatureTest extends AbstractStoregateTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -181,6 +181,6 @@ public class StoregateReadFeatureTest extends AbstractStoregateTest { final CountingInputStream in = new CountingInputStream(new StoregateReadFeature(session, nodeid).read(test, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateTimestampFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateTimestampFeatureTest.java index d3dcc03f2e..f9fcb23d54 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateTimestampFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateTimestampFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.storegate; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -57,7 +57,7 @@ public class StoregateTimestampFeatureTest extends AbstractStoregateTest { assertEquals(created, new DefaultAttributesFinderFeature(session).find(file).getCreationDate()); assertEquals(modified, new DefaultAttributesFinderFeature(session).find(file).getModificationDate()); assertEquals(attr, status.getResponse()); - new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(file, room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(file, room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -71,6 +71,6 @@ public class StoregateTimestampFeatureTest extends AbstractStoregateTest { final long modified = Instant.now().minusSeconds(5 * 24 * 60 * 60).getEpochSecond() * 1000; new StoregateTimestampFeature(session, nodeid).setTimestamp(test, modified); assertEquals(modified, new StoregateAttributesFinderFeature(session, nodeid).find(test).getModificationDate()); - new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(test, room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Arrays.asList(test, room), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateWriteFeatureTest.java b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateWriteFeatureTest.java index fbf90ecb28..d051859165 100644 --- a/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateWriteFeatureTest.java +++ b/storegate/src/test/java/ch/cyberduck/core/storegate/StoregateWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.storegate; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.ConnectionCanceledException; @@ -101,7 +101,7 @@ public class StoregateWriteFeatureTest extends AbstractStoregateTest { attributes = new StoregateAttributesFinderFeature(session, nodeid).find(test); assertNotNull(attributes.getFileId()); assertEquals(nodeId, new StoregateIdProvider(session).getFileId(test)); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -127,7 +127,7 @@ public class StoregateWriteFeatureTest extends AbstractStoregateTest { IOUtils.readFully(stream, compare); stream.close(); assertArrayEquals(content, compare); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -157,7 +157,7 @@ public class StoregateWriteFeatureTest extends AbstractStoregateTest { new StreamCopier(status, status).transfer(new ByteArrayInputStream(content), out); out.close(); new StoregateLockFeature(session, nodeid).unlock(test, lockId); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -179,7 +179,7 @@ public class StoregateWriteFeatureTest extends AbstractStoregateTest { assertNotNull(out); new StreamCopier(status, status).transfer(new ByteArrayInputStream(content), out); out.close(); - new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new StoregateDeleteFeature(session, nodeid).delete(Collections.singletonList(room), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = TransferStatusCanceledException.class) diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 7ad703dbc5..34f04e369c 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -91,7 +91,7 @@ public class CopyWorkerTest extends AbstractDAVTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new DAVReadFeature(session), cryptomator).read(target, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -115,7 +115,7 @@ public class CopyWorkerTest extends AbstractDAVTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -140,7 +140,7 @@ public class CopyWorkerTest extends AbstractDAVTest { worker.run(session); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(source)); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); } @Test @@ -171,7 +171,7 @@ public class CopyWorkerTest extends AbstractDAVTest { assertTrue(cryptomator.getFeature(session, Find.class, new DAVFindFeature(session)).find(folderRenamed)); final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DAVFindFeature(session)).find(fileRenamedInRenamedFolder)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -200,7 +200,7 @@ public class CopyWorkerTest extends AbstractDAVTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new CryptoReadFeature(session, new DAVReadFeature(session), cryptomator).read(encryptedFile, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -228,7 +228,7 @@ public class CopyWorkerTest extends AbstractDAVTest { assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(encryptedFile)); assertTrue(new DAVFindFeature(session).find(cleartextFolder)); assertTrue(new DAVFindFeature(session).find(cleartextFile)); - new DeleteWorker(new DisabledLoginCallback(), Collections.singletonList(vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Collections.singletonList(vault), ProgressListener.noop).run(session); registry.clear(); } @@ -261,7 +261,7 @@ public class CopyWorkerTest extends AbstractDAVTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); assertEquals(content.length, IOUtils.copy(new DAVReadFeature(session).read(cleartextFile, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out)); assertArrayEquals(content, out.toByteArray()); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(vault, clearFolder), ProgressListener.noop).run(session); registry.clear(); } @@ -290,7 +290,7 @@ public class CopyWorkerTest extends AbstractDAVTest { assertTrue(new DAVFindFeature(session).find(cleartextFolder)); final Path fileRenamed = new Path(cleartextFolder, encryptedFile.getName(), EnumSet.of(Path.Type.file)); assertTrue(new DAVFindFeature(session).find(fileRenamed)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(cleartextFolder, vault), ProgressListener.noop).run(session); registry.clear(); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/CryptoDAVSingleTransferWorkerTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/CryptoDAVSingleTransferWorkerTest.java index c2bc48730a..1beccd5bca 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/CryptoDAVSingleTransferWorkerTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/CryptoDAVSingleTransferWorkerTest.java @@ -18,10 +18,10 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.Credentials; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.NullFilter; import ch.cyberduck.core.Path; @@ -119,7 +119,7 @@ public class CryptoDAVSingleTransferWorkerTest extends AbstractDAVTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); assertTrue(cryptomator.getFeature(session, Find.class, new DAVFindFeature(session)).find(dir1)); @@ -137,7 +137,7 @@ public class CryptoDAVSingleTransferWorkerTest extends AbstractDAVTest { new StreamCopier(new TransferStatus(), new TransferStatus()).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(file1, file2, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localFile2.delete(); localDirectory1.delete(); @@ -179,10 +179,10 @@ public class CryptoDAVSingleTransferWorkerTest extends AbstractDAVTest { return TransferAction.overwrite; } }, new DisabledTransferErrorCallback(), - ProgressListener.noop, StreamListener.noop, new DisabledLoginCallback(), new DisabledNotificationService()) { + ProgressListener.noop, StreamListener.noop, LoginCallback.noop, new DisabledNotificationService()) { }.run(session)); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(file1, dir1, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(file1, dir1, vault), LoginCallback.noop, new Delete.DisabledCallback()); localFile1.delete(); localDirectory1.delete(); } diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVDirectoryFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVDirectoryFeatureTest.java index df3f84fbc0..960ebfa6d4 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVDirectoryFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVDirectoryFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.dav.AbstractDAVTest; import ch.cyberduck.core.dav.DAVDeleteFeature; @@ -60,7 +60,7 @@ public class DAVDirectoryFeatureTest extends AbstractDAVTest { cryptomator.getFeature(session, Directory.class, new DAVDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DAVWriteFeature(session)), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -75,6 +75,6 @@ public class DAVDirectoryFeatureTest extends AbstractDAVTest { cryptomator.getFeature(session, Directory.class, new DAVDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DAVWriteFeature(session)), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVListServiceTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVListServiceTest.java index 857675a1c0..a2bbacd732 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVListServiceTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVListServiceTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; @@ -62,6 +62,6 @@ public class DAVListServiceTest extends AbstractDAVTest { new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator), test, new TransferStatus()); assertEquals(test, new CryptoListService(session, new DAVListService(session), cryptomator).list(vault, new DisabledListProgressListener()).get(0)); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVMoveFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVMoveFeatureTest.java index ca12e7d352..08cab1ee62 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVMoveFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVMoveFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -86,6 +86,6 @@ public class DAVMoveFeatureTest extends AbstractDAVTest { final Path fileRenamedInRenamedFolder = new Path(folderRenamed, "f1", EnumSet.of(Path.Type.file)); assertTrue(cryptomator.getFeature(session, Find.class, new DAVFindFeature(session)).find(fileRenamedInRenamedFolder)); cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList( - fileRenamedInRenamedFolder, folderRenamed, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + fileRenamedInRenamedFolder, folderRenamed, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVReadFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVReadFeatureTest.java index c37a2d9212..09b6dedd5d 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVReadFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVReadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -124,6 +124,6 @@ public class DAVReadFeatureTest extends AbstractDAVTest { System.arraycopy(content, 65537, reference, 0, reference.length); assertArrayEquals(reference, buffer.toByteArray()); } - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVTouchFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVTouchFeatureTest.java index 1dbbdd0c76..aa46657fdd 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVTouchFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVTouchFeatureTest.java @@ -16,8 +16,8 @@ package ch.cyberduck.core.cryptomator; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoTouchFeature; import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; @@ -68,7 +68,7 @@ public class DAVTouchFeatureTest extends AbstractDAVTest { .withAttributes(cryptomator.getFeature(session, AttributesFinder.class, new DAVAttributesFinderFeature(session)).find(template)); assertTrue(cryptomator.getFeature(session, Find.class, new DAVFindFeature(session)).find(test)); assertEquals(test.attributes(), cryptomator.getFeature(session, AttributesFinder.class, new DAVAttributesFinderFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -83,7 +83,7 @@ public class DAVTouchFeatureTest extends AbstractDAVTest { new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -98,10 +98,10 @@ public class DAVTouchFeatureTest extends AbstractDAVTest { new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test)); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVWriteFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVWriteFeatureTest.java index 2375323736..bb4a051da3 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVWriteFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVWriteFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; @@ -93,6 +93,6 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { final InputStream in = new CryptoReadFeature(session, new DAVReadFeature(session), cryptomator).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop); new StreamCopier(status, status).transfer(in, buffer); assertArrayEquals(content, buffer.toByteArray()); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVAttributesFinderFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVAttributesFinderFeatureTest.java index 65edf0a8f8..e454b8620f 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVAttributesFinderFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVAttributesFinderFeatureTest.java @@ -3,9 +3,9 @@ package ch.cyberduck.core.dav; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Attributes; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordCallback; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.cryptomator.CryptoVault; @@ -83,7 +83,7 @@ public class DAVAttributesFinderFeatureTest extends AbstractDAVTest { // Expected } finally { - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } @@ -197,15 +197,15 @@ public class DAVAttributesFinderFeatureTest extends AbstractDAVTest { final PathAttributes attributes = cryptomator.getFeature(session, AttributesFinder.class, new DefaultAttributesFinderFeature(session)).find(test); assertNotNull(attributes); assertEquals(0L, attributes.getSize()); - cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), new DisabledLoginCallback(), new Delete.DisabledCallback()); + cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testFindNoPropfind() throws Exception { final Host host = new Host(new DAVSSLProtocol(), "update.cyberduck.io"); final DAVSession session = new DAVSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); final DAVAttributesFinderFeature f = new DAVAttributesFinderFeature(session); final Path file = new Path("/robots.txt", EnumSet.of(Path.Type.file)); final Attributes attributes = f.find(file); diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVCopyFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVCopyFeatureTest.java index dc5df03213..07626d04fa 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVCopyFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVCopyFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.dav; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.exception.InteroperabilityException; @@ -52,15 +52,15 @@ public class DAVCopyFeatureTest extends AbstractDAVTest { assertEquals(new DAVAttributesFinderFeature(session).find(test), new DAVAttributesFinderFeature(session).find(copy)); assertTrue(new DAVFindFeature(session).find(test)); assertTrue(new DAVFindFeature(session).find(copy)); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DAVDeleteFeature(session).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testCopyWithLock() throws Exception { final Path test = new DAVTouchFeature(session).touch(new DAVWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertThrows(InteroperabilityException.class, () -> new DAVLockFeature(session).lock(test)); - new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -76,7 +76,7 @@ public class DAVCopyFeatureTest extends AbstractDAVTest { final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new DAVDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -93,6 +93,6 @@ public class DAVCopyFeatureTest extends AbstractDAVTest { assertTrue(new DAVFindFeature(session).find(file)); assertTrue(new DAVFindFeature(session).find(copy)); assertTrue(new DAVFindFeature(session).find(new Path(copy, name, EnumSet.of(Path.Type.file)))); - new DAVDeleteFeature(session).delete(Arrays.asList(copy, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(copy, directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVDeleteFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVDeleteFeatureTest.java index fd74fe16e1..01cd331d10 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVDeleteFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVDeleteFeatureTest.java @@ -1,7 +1,7 @@ package ch.cyberduck.core.dav; import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.InteroperabilityException; import ch.cyberduck.core.exception.NotfoundException; @@ -27,7 +27,7 @@ public class DAVDeleteFeatureTest extends AbstractDAVTest { final Path test = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); new DAVTouchFeature(session).touch(new DAVWriteFeature(session), test, new TransferStatus()); assertTrue(new DAVFindFeature(session).find(test)); - new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DAVFindFeature(session).find(test)); } @@ -43,7 +43,7 @@ public class DAVDeleteFeatureTest extends AbstractDAVTest { // Not supported } assertTrue(new DAVFindFeature(session).find(test)); - new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus().setLockId(lock)), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus().setLockId(lock)), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DAVFindFeature(session).find(test)); } @@ -53,13 +53,13 @@ public class DAVDeleteFeatureTest extends AbstractDAVTest { new DAVDirectoryFeature(session).mkdir(new DAVWriteFeature(session), test, new TransferStatus()); assertTrue(new DAVFindFeature(session).find(test)); new DAVTouchFeature(session).touch(new DAVWriteFeature(session), new Path(test, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); - new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(new DAVFindFeature(session).find(test)); } @Test(expected = NotfoundException.class) public void testDeleteNotFound() throws Exception { final Path test = new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVDirectoryFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVDirectoryFeatureTest.java index c5bba881fc..e201c0d79b 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVDirectoryFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVDirectoryFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.dav; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.ConflictException; import ch.cyberduck.core.features.Delete; @@ -44,7 +44,7 @@ public class DAVDirectoryFeatureTest extends AbstractDAVTest { new DAVDirectoryFeature(session).mkdir(new DAVWriteFeature(session), test, new TransferStatus()); assertTrue(session.getFeature(Find.class).find(test)); assertThrows(ConflictException.class, () -> new DAVDirectoryFeature(session).mkdir(new DAVWriteFeature(session), test, new TransferStatus())); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVListServiceTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVListServiceTest.java index c56f69bab5..6e67a04909 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVListServiceTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVListServiceTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.dav; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Delete; @@ -50,6 +50,6 @@ public class DAVListServiceTest extends AbstractDAVTest { new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertThrows(NotfoundException.class, () -> new DAVListService(session).list(new Path(test.getAbsolute(), EnumSet.of(Path.Type.directory, Path.Type.volume)), new DisabledListProgressListener())); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVMetadataFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVMetadataFeatureTest.java index a3470799df..0846e60b05 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVMetadataFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVMetadataFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.dav; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; @@ -52,7 +52,7 @@ public class DAVMetadataFeatureTest extends AbstractDAVTest { test.attributes().setMetadata(metadata); feature.setMetadata(test, status.setMetadata(Collections.emptyMap())); assertFalse(feature.getMetadata(test).containsKey("Test")); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -67,6 +67,6 @@ public class DAVMetadataFeatureTest extends AbstractDAVTest { assertTrue(metadata.containsKey("Test")); assertEquals(v, metadata.get("Test")); assertEquals(status.getMetadata(), metadata); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVMoveFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVMoveFeatureTest.java index e531f42157..06fa8412b3 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVMoveFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVMoveFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.dav; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.exception.ConflictException; @@ -58,14 +58,14 @@ public class DAVMoveFeatureTest extends AbstractDAVTest { assertTrue(new DAVFindFeature(session).find(target)); assertEquals(status.getResponse(), target.attributes()); assertEquals(attr, new DAVAttributesFinderFeature(session).find(target)); - new DAVDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test public void testMoveWithLock() throws Exception { final Path test = new DAVTouchFeature(session).touch(new DAVWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertThrows(InteroperabilityException.class, () -> new DAVLockFeature(session).lock(test)); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -93,7 +93,7 @@ public class DAVMoveFeatureTest extends AbstractDAVTest { assertEquals(attr, new DAVAttributesFinderFeature(session).find(new Path(target, test.getName(), EnumSet.of(Path.Type.file)))); assertEquals(attr.getModificationDate(), new DAVAttributesFinderFeature(session).find(new Path(target, test.getName(), EnumSet.of(Path.Type.file))).getModificationDate()); assertNotEquals(attr.getETag(), new DAVAttributesFinderFeature(session).find(new Path(target, test.getName(), EnumSet.of(Path.Type.file))).getETag()); - new DAVDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -106,7 +106,7 @@ public class DAVMoveFeatureTest extends AbstractDAVTest { new DAVMoveFeature(session).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new DAVFindFeature(session).find(test)); assertTrue(new DAVFindFeature(session).find(target)); - new DAVDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVReadFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVReadFeatureTest.java index c7a58d084e..e3160d1229 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVReadFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVReadFeatureTest.java @@ -2,8 +2,8 @@ package ch.cyberduck.core.dav; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.exception.NotfoundException; @@ -69,9 +69,9 @@ public class DAVReadFeatureTest extends AbstractDAVTest { } }; new DefaultDownloadFeature(session).download(new DAVReadFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), - StreamListener.noop, status, new DisabledLoginCallback()); + StreamListener.noop, status, LoginCallback.noop); assertEquals(923L, local.attributes().getSize()); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -91,7 +91,7 @@ public class DAVReadFeatureTest extends AbstractDAVTest { assertNotNull(in); in.close(); } - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -119,7 +119,7 @@ public class DAVReadFeatureTest extends AbstractDAVTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -147,7 +147,7 @@ public class DAVReadFeatureTest extends AbstractDAVTest { System.arraycopy(content, 100, reference, 0, content.length - 100); assertArrayEquals(reference, buffer.toByteArray()); in.close(); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -158,6 +158,6 @@ public class DAVReadFeatureTest extends AbstractDAVTest { final CountingInputStream in = new CountingInputStream(new DAVReadFeature(session).read(test, status, ConnectionCallback.noop)); in.close(); assertEquals(0L, in.getByteCount(), 0L); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVSessionTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVSessionTest.java index 3dc8911014..03e9953a81 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVSessionTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVSessionTest.java @@ -63,8 +63,8 @@ public class DAVSessionTest extends AbstractDAVTest { new CertificateStoreX509TrustManager(new DisabledCertificateTrustCallback(), new DefaultTrustManagerHostnameCallback(host), new DefaultCertificateStore()), new CertificateStoreX509KeyManager(new DisabledCertificateIdentityCallback(), host, new DefaultCertificateStore())); try { - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); } catch(ConnectionRefusedException e) { assertEquals("Connection failed", e.getMessage()); @@ -77,8 +77,8 @@ public class DAVSessionTest extends AbstractDAVTest { final Host host = new Host(new DAVProtocol(), "cyberduck.ch"); final DAVSession session = new DAVSession(host, new DisabledX509TrustManager(), new DefaultX509KeyManager()); try { - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); new DAVListService(session).list(new DefaultHomeFinderService(session).find(), new DisabledListProgressListener()); } catch(InteroperabilityException | ConflictException e) { @@ -96,7 +96,7 @@ public class DAVSessionTest extends AbstractDAVTest { final Path test = new DAVTouchFeature(session).touch(new DAVWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); ; assertTrue(session.getFeature(Find.class).find(test)); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); assertFalse(session.getFeature(Find.class).find(test)); } @@ -132,15 +132,14 @@ public class DAVSessionTest extends AbstractDAVTest { throw new ConnectionCanceledException(); } })); - final LoginConnectionService c = new LoginConnectionService( - new DisabledLoginCallback() { - @Override - public Credentials prompt(final Host bookmark, String username, - String title, String reason, LoginOptions options) { - // - return new Credentials(); - } - }, + final LoginConnectionService c = new LoginConnectionService(new DisabledLoginCallback() { + @Override + public Credentials prompt(final Host bookmark, String username, + String title, String reason, LoginOptions options) { + // + return new Credentials(); + } + }, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); @@ -163,7 +162,7 @@ public class DAVSessionTest extends AbstractDAVTest { } ), new DefaultX509KeyManager() ); - final LoginConnectionService s = new LoginConnectionService(new DisabledLoginCallback(), new DisabledHostKeyCallback(), new DisabledPasswordStore(), + final LoginConnectionService s = new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop); s.check(session, CancelCallback.noop); } @@ -201,7 +200,7 @@ public class DAVSessionTest extends AbstractDAVTest { new KeychainX509KeyManager(new DisabledCertificateIdentityCallback(), host, new DisabledCertificateStore())) { }; final LoginConnectionService c = new LoginConnectionService( - new DisabledLoginCallback(), + LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop, diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVTimestampFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVTimestampFeatureTest.java index 152a978869..f836b03cf7 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVTimestampFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVTimestampFeatureTest.java @@ -16,7 +16,7 @@ package ch.cyberduck.core.dav; */ import ch.cyberduck.core.AlphanumericRandomStringService; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.features.Delete; @@ -51,7 +51,7 @@ public class DAVTimestampFeatureTest extends AbstractDAVTest { assertEquals(5000L, new DAVAttributesFinderFeature(session).find(file).getModificationDate()); new DAVMetadataFeature(session).setMetadata(file, status.setMetadata(Collections.emptyMap())); assertEquals(5000L, new DAVAttributesFinderFeature(session).find(file).getModificationDate()); - new DAVDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -64,6 +64,6 @@ public class DAVTimestampFeatureTest extends AbstractDAVTest { final Path file = new DAVTouchFeature(session).touch(new DAVWriteFeature(session), new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertNotEquals(5000L, new DAVAttributesFinderFeature(session).find(folder).getModificationDate()); assertNotEquals(5000L, new DefaultAttributesFinderFeature(session).find(folder).getModificationDate()); - new DAVDeleteFeature(session).delete(Arrays.asList(file, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(file, folder), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVUploadFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVUploadFeatureTest.java index 8ec8f64192..cff1eb8905 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVUploadFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVUploadFeatureTest.java @@ -20,8 +20,8 @@ package ch.cyberduck.core.dav; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DefaultPathAttributes; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.exception.AccessDeniedException; @@ -100,7 +100,7 @@ public class DAVUploadFeatureTest extends AbstractDAVTest { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } @@ -109,6 +109,6 @@ public class DAVUploadFeatureTest extends AbstractDAVTest { final DAVUploadFeature feature = new DAVUploadFeature(session); final Path test = new DAVTouchFeature(session).touch(new DAVWriteFeature(session), new Path(new DefaultHomeFinderService(session).find(), new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus()); assertTrue(feature.append(test, new TransferStatus().setExists(true).setLength(0L).setRemote(new DAVAttributesFinderFeature(session).find(test))).append); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVWriteFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVWriteFeatureTest.java index cfd1fd6665..61e6f720d5 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVWriteFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVWriteFeatureTest.java @@ -3,8 +3,8 @@ package ch.cyberduck.core.dav; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -72,7 +72,7 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { System.arraycopy(content, 1, reference, 0, content.length - 1); assertArrayEquals(reference, buffer); } - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -105,7 +105,7 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { System.arraycopy(content, 1, reference, 0, content.length - 1); assertArrayEquals(reference, buffer); } - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -144,7 +144,7 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { final PathAttributes attr2 = new DAVAttributesFinderFeature(session).find(test); assertEquals(101L, attr2.getSize()); assertNotEquals(attr1.getETag(), attr2.getETag()); - new DAVDeleteFeature(session).delete(Arrays.asList(test, folder), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(test, folder), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -176,7 +176,7 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(content.length); IOUtils.copy(new DAVReadFeature(session).read(test, new TransferStatus().setLength(content.length), ConnectionCallback.noop), out); assertArrayEquals(content, out.toByteArray()); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -217,7 +217,7 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { IOUtils.readFully(in, buffer); in.close(); assertArrayEquals(content, buffer); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -245,7 +245,7 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(source.length); IOUtils.copy(new DAVReadFeature(session).read(test, new TransferStatus().setLength(source.length), ConnectionCallback.noop), out); assertArrayEquals(source, out.toByteArray()); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -273,7 +273,7 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { final ByteArrayOutputStream out = new ByteArrayOutputStream(source.length); IOUtils.copy(new DAVReadFeature(session).read(test, new TransferStatus().setLength(source.length), ConnectionCallback.noop), out); assertArrayEquals(source, out.toByteArray()); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = AccessDeniedException.class) diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVCopyFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVCopyFeatureTest.java index f4b3ae81d5..c2d52b44c9 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVCopyFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVCopyFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.dav.microsoft; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.dav.DAVAttributesFinderFeature; import ch.cyberduck.core.dav.DAVCopyFeature; @@ -58,8 +58,8 @@ public class MicrosoftIISDAVCopyFeatureTest extends AbstractMicrosoftIISDAVTest assertEquals(new DAVAttributesFinderFeature(session).find(test), new DAVAttributesFinderFeature(session).find(copy)); assertTrue(new MicrosoftIISDAVFindFeature(session).find(test)); assertTrue(new MicrosoftIISDAVFindFeature(session).find(copy)); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DAVDeleteFeature(session).delete(Collections.singletonList(copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -72,8 +72,8 @@ public class MicrosoftIISDAVCopyFeatureTest extends AbstractMicrosoftIISDAVTest assertTrue(new MicrosoftIISDAVFindFeature(session).find(test)); assertTrue(new MicrosoftIISDAVFindFeature(session).find(target)); assertEquals(test.attributes(), target.attributes()); - new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus().setLockId(lock)), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DAVDeleteFeature(session).delete(Collections.singletonMap(target, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus().setLockId(lock)), LoginCallback.noop, new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(target, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -89,7 +89,7 @@ public class MicrosoftIISDAVCopyFeatureTest extends AbstractMicrosoftIISDAVTest final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new DAVDeleteFeature(session).delete(Arrays.asList(test, copy), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(test, copy), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -106,8 +106,8 @@ public class MicrosoftIISDAVCopyFeatureTest extends AbstractMicrosoftIISDAVTest final Find find = new DefaultFindFeature(session); assertTrue(find.find(test)); assertTrue(find.find(copy)); - new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus().setLockId(lock)), new DisabledLoginCallback(), new Delete.DisabledCallback()); - new DAVDeleteFeature(session).delete(Collections.singletonMap(copy, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(test, new TransferStatus().setLockId(lock)), LoginCallback.noop, new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(copy, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -124,6 +124,6 @@ public class MicrosoftIISDAVCopyFeatureTest extends AbstractMicrosoftIISDAVTest assertTrue(new MicrosoftIISDAVFindFeature(session).find(file)); assertTrue(new MicrosoftIISDAVFindFeature(session).find(copy)); assertTrue(new MicrosoftIISDAVFindFeature(session).find(new Path(copy, name, EnumSet.of(Path.Type.file)))); - new DAVDeleteFeature(session).delete(Arrays.asList(copy, directory), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Arrays.asList(copy, directory), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVLockFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVLockFeatureTest.java index f1aee47c0d..310c62aa73 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVLockFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVLockFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.dav.microsoft; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.ProgressListener; @@ -83,7 +83,7 @@ public class MicrosoftIISDAVLockFeatureTest extends AbstractMicrosoftIISDAVTest assertArrayEquals(reference, buffer); } new DAVLockFeature(session).unlock(test, lock); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVMoveFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVMoveFeatureTest.java index 0722f8cb7e..1bb0bf5799 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVMoveFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVMoveFeatureTest.java @@ -19,7 +19,7 @@ package ch.cyberduck.core.dav.microsoft; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.dav.DAVAttributesFinderFeature; @@ -66,7 +66,7 @@ public class MicrosoftIISDAVMoveFeatureTest extends AbstractMicrosoftIISDAVTest assertTrue(new MicrosoftIISDAVFindFeature(session).find(target)); assertEquals(status.getResponse(), target.attributes()); assertEquals(attr, new DAVAttributesFinderFeature(session).find(target)); - new DAVDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -80,7 +80,7 @@ public class MicrosoftIISDAVMoveFeatureTest extends AbstractMicrosoftIISDAVTest assertFalse(new MicrosoftIISDAVFindFeature(session).find(test)); assertTrue(new MicrosoftIISDAVFindFeature(session).find(target)); assertEquals(test.attributes(), target.attributes()); - new DAVDeleteFeature(session).delete(Collections.singletonMap(target, new TransferStatus()), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonMap(target, new TransferStatus()), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -108,7 +108,7 @@ public class MicrosoftIISDAVMoveFeatureTest extends AbstractMicrosoftIISDAVTest assertEquals(attr, new DAVAttributesFinderFeature(session).find(new Path(target, test.getName(), EnumSet.of(Path.Type.file)))); assertEquals(attr.getModificationDate(), new DAVAttributesFinderFeature(session).find(new Path(target, test.getName(), EnumSet.of(Path.Type.file))).getModificationDate()); assertEquals(attr.getETag(), new DAVAttributesFinderFeature(session).find(new Path(target, test.getName(), EnumSet.of(Path.Type.file))).getETag()); - new DAVDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -121,7 +121,7 @@ public class MicrosoftIISDAVMoveFeatureTest extends AbstractMicrosoftIISDAVTest new DAVMoveFeature(session).move(test, target, new TransferStatus().setExists(true), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new MicrosoftIISDAVFindFeature(session).find(test)); assertTrue(new MicrosoftIISDAVFindFeature(session).find(target)); - new DAVDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test @@ -136,7 +136,7 @@ public class MicrosoftIISDAVMoveFeatureTest extends AbstractMicrosoftIISDAVTest new DAVMoveFeature(session).move(test, target, new TransferStatus().setExists(true).setLockId(lock), new Delete.DisabledCallback(), ConnectionCallback.noop); assertFalse(new MicrosoftIISDAVFindFeature(session).find(test)); assertTrue(new MicrosoftIISDAVFindFeature(session).find(target)); - new DAVDeleteFeature(session).delete(Collections.singletonList(target), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(target), LoginCallback.noop, new Delete.DisabledCallback()); } @Test(expected = NotfoundException.class) diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVReadFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVReadFeatureTest.java index 1a55262796..f1f6d0a7fc 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVReadFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVReadFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.dav.microsoft; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.dav.DAVDeleteFeature; @@ -97,7 +97,7 @@ public class MicrosoftIISDAVReadFeatureTest extends AbstractMicrosoftIISDAVTest for(int i = 0; i < num; i++) { completion.take().get(); } - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVTimestampFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVTimestampFeatureTest.java index 82fe1cde1c..4ab891109c 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVTimestampFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVTimestampFeatureTest.java @@ -18,7 +18,7 @@ package ch.cyberduck.core.dav.microsoft; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.DefaultPathPredicate; import ch.cyberduck.core.DisabledListProgressListener; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.dav.DAVDeleteFeature; @@ -52,7 +52,7 @@ public class MicrosoftIISDAVTimestampFeatureTest extends AbstractMicrosoftIISDAV assertEquals(status.getResponse(), attr); assertEquals(5000L, new MicrosoftIISDAVListService(session, new MicrosoftIISDAVAttributesFinderFeature(session)).list(file.getParent(), new DisabledListProgressListener()).find(new DefaultPathPredicate(file)).attributes().getModificationDate()); - new DAVDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); session.close(); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVUploadFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVUploadFeatureTest.java index e0f4a40b24..c03781b2bc 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVUploadFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/microsoft/MicrosoftIISDAVUploadFeatureTest.java @@ -17,8 +17,8 @@ package ch.cyberduck.core.dav.microsoft; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.dav.DAVDeleteFeature; @@ -58,7 +58,7 @@ public class MicrosoftIISDAVUploadFeatureTest extends AbstractMicrosoftIISDAVTes new DAVWriteFeature(session), test, local, new BandwidthThrottle(BandwidthThrottle.UNLIMITED), ProgressListener.noop, StreamListener.noop, new TransferStatus().setLength(content.length), ConnectionCallback.noop); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java index 197fa18fd2..3b9d95cb91 100644 --- a/webdav/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/shared/CachingAttributesFinderFeatureTest.java @@ -18,8 +18,8 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Attributes; import ch.cyberduck.core.CachingAttributesFinderFeature; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.ListProgressListener; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.PathCache; @@ -86,6 +86,6 @@ public class CachingAttributesFinderFeatureTest extends AbstractDAVTest { catch(NotfoundException e) { // Expected } - new DAVDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java index abea58a590..ef066e2670 100644 --- a/webdav/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/shared/DefaultAttributesFinderFeatureTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.shared; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.Attributes; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.dav.AbstractDAVTest; import ch.cyberduck.core.dav.DAVDeleteFeature; @@ -61,6 +61,6 @@ public class DefaultAttributesFinderFeatureTest extends AbstractDAVTest { catch(NotfoundException e) { // Expected } - new DAVDeleteFeature(session).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(file), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/shared/FallbackAttributesFinderFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/shared/FallbackAttributesFinderFeatureTest.java index ca3d803bfb..6041f156b9 100644 --- a/webdav/src/test/java/ch/cyberduck/core/shared/FallbackAttributesFinderFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/shared/FallbackAttributesFinderFeatureTest.java @@ -16,9 +16,9 @@ package ch.cyberduck.core.shared; */ import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.FallbackAttributesFinderFeature; import ch.cyberduck.core.Host; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathAttributes; import ch.cyberduck.core.dav.DAVAttributesFinderFeature; @@ -44,8 +44,8 @@ public class FallbackAttributesFinderFeatureTest { @Test public void testFindNoWebDAV() throws Exception { final DAVSession session = new DAVSession(new Host(new DAVSSLProtocol(), "ftp.gnu.org"), new DisabledX509TrustManager(), new DefaultX509KeyManager()); - session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), new DisabledLoginCallback(), CancelCallback.noop); - session.login(new DisabledLoginCallback(), CancelCallback.noop); + session.open(new DisabledProxyFinder(), new DisabledHostKeyCallback(), LoginCallback.noop, CancelCallback.noop); + session.login(LoginCallback.noop, CancelCallback.noop); // Handle 405 Method Not Allowed final AttributesFinder f = new FallbackAttributesFinderFeature(new DefaultAttributesFinderFeature(session), new DAVAttributesFinderFeature(session)); final PathAttributes attr = f.find(new Path("/gnu/wget/wget-1.19.4.tar.gz", EnumSet.of(Path.Type.file))); diff --git a/webdav/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java b/webdav/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java index 790d48b33c..3d4233c929 100644 --- a/webdav/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/worker/CopyWorkerTest.java @@ -17,7 +17,7 @@ package ch.cyberduck.core.worker; import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.ConnectionCallback; -import ch.cyberduck.core.DisabledLoginCallback; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.PathCache; import ch.cyberduck.core.ProgressListener; @@ -54,7 +54,7 @@ public class CopyWorkerTest extends AbstractDAVTest { worker.run(session); assertTrue(new DAVFindFeature(session).find(source)); assertTrue(new DAVFindFeature(session).find(target)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(source, target), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(source, target), ProgressListener.noop).run(session); } @Test @@ -72,7 +72,7 @@ public class CopyWorkerTest extends AbstractDAVTest { worker.run(session); assertTrue(new DAVFindFeature(session).find(sourceFile)); assertTrue(new DAVFindFeature(session).find(targetFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(sourceFile, targetFolder), ProgressListener.noop).run(session); } @Test @@ -90,6 +90,6 @@ public class CopyWorkerTest extends AbstractDAVTest { assertTrue(new DAVFindFeature(session).find(targetFile)); assertTrue(new DAVFindFeature(session).find(folder)); assertTrue(new DAVFindFeature(session).find(sourceFile)); - new DeleteWorker(new DisabledLoginCallback(), Arrays.asList(folder, targetFile), ProgressListener.noop).run(session); + new DeleteWorker(LoginCallback.noop, Arrays.asList(folder, targetFile), ProgressListener.noop).run(session); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/worker/DAVConcurrentTransferWorkerTest.java b/webdav/src/test/java/ch/cyberduck/core/worker/DAVConcurrentTransferWorkerTest.java index f2b0251860..76a373eebe 100644 --- a/webdav/src/test/java/ch/cyberduck/core/worker/DAVConcurrentTransferWorkerTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/worker/DAVConcurrentTransferWorkerTest.java @@ -99,7 +99,7 @@ public class DAVConcurrentTransferWorkerTest extends AbstractDAVTest { }, new DisabledTransferErrorCallback(), ConnectionCallback.noop, ProgressListener.noop, bytecount, new DisabledNotificationService()).run(session)); assertArrayEquals(content, IOUtils.toByteArray(localFile.getInputStream())); assertEquals(content.length, bytecount.getRecv()); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); local.delete(); localFile.delete(); } @@ -201,6 +201,6 @@ public class DAVConcurrentTransferWorkerTest extends AbstractDAVTest { assertEquals(content.length, counter.getSent(), 0L); assertTrue(t.isComplete()); assertTrue(failed.get()); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } } diff --git a/webdav/src/test/java/ch/cyberduck/core/worker/DAVSingleTransferWorkerTest.java b/webdav/src/test/java/ch/cyberduck/core/worker/DAVSingleTransferWorkerTest.java index 59090812e8..cd3f42726a 100644 --- a/webdav/src/test/java/ch/cyberduck/core/worker/DAVSingleTransferWorkerTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/worker/DAVSingleTransferWorkerTest.java @@ -19,10 +19,10 @@ import ch.cyberduck.core.AlphanumericRandomStringService; import ch.cyberduck.core.BytecountStreamListener; import ch.cyberduck.core.ConnectionCallback; import ch.cyberduck.core.DisabledHostKeyCallback; -import ch.cyberduck.core.DisabledLoginCallback; import ch.cyberduck.core.DisabledPasswordStore; import ch.cyberduck.core.Host; import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; @@ -129,7 +129,7 @@ public class DAVSingleTransferWorkerTest extends AbstractDAVTest { return super._getFeature(type); } }; - new LoginConnectionService(new DisabledLoginCallback(), + new LoginConnectionService(LoginCallback.noop, new DisabledHostKeyCallback(), new DisabledPasswordStore(), ProgressListener.noop).connect(session, CancelCallback.noop); @@ -157,6 +157,6 @@ public class DAVSingleTransferWorkerTest extends AbstractDAVTest { assertEquals(content.length, counter.getSent(), 0L); assertTrue(t.isComplete()); assertTrue(failed.get()); - new DAVDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback()); + new DAVDeleteFeature(session).delete(Collections.singletonList(test), LoginCallback.noop, new Delete.DisabledCallback()); } }