Merge pull request #17532 from iterate-ch/bugfix/MD-25299-comparison

Return custom comparison service for content hash.

Author: dkocher

azure/src/main/java/ch/cyberduck/core/azure/AzureAttributesFinderFeature.java

@@ -109,7 +109,7 @@ public PathAttributes toAttributes(final BlobProperties properties) {
         attributes.setSize(properties.getBlobSize());
         attributes.setModificationDate(properties.getLastModified().toInstant().toEpochMilli());
         if(properties.getContentMd5() != null) {
-            attributes.setChecksum(Checksum.parse(Hex.encodeHexString(Base64.decodeBase64(properties.getContentMd5()))));
+            attributes.setChecksum(Checksum.parse(Hex.encodeHexString(properties.getContentMd5())));
         }
         attributes.setETag(properties.getETag());
         final Map<String, String> custom = new HashMap<>();
@@ -124,7 +124,7 @@ public PathAttributes toAttributes(final BlobItemProperties properties) {
         attributes.setModificationDate(properties.getLastModified().toInstant().toEpochMilli());
         attributes.setETag(properties.getETag());
         if(properties.getContentMd5() != null) {
-            attributes.setChecksum(Checksum.parse(Hex.encodeHexString(Base64.decodeBase64(properties.getContentMd5()))));
+            attributes.setChecksum(Checksum.parse(Hex.encodeHexString(properties.getContentMd5())));
         }
         return attributes;
     }

azure/src/main/java/ch/cyberduck/core/azure/AzureProtocol.java

@@ -23,6 +23,11 @@
 import ch.cyberduck.core.PathContainerService;
 import ch.cyberduck.core.Protocol;
 import ch.cyberduck.core.Scheme;
+import ch.cyberduck.core.synchronization.ChainedComparisonService;
+import ch.cyberduck.core.synchronization.ChecksumComparisonService;
+import ch.cyberduck.core.synchronization.ComparisonService;
+import ch.cyberduck.core.synchronization.DefaultComparisonService;
+import ch.cyberduck.core.synchronization.ETagComparisonService;
 import ch.cyberduck.core.text.DefaultLexicographicOrderComparator;
 
 import org.apache.commons.codec.binary.Base64;
@@ -109,6 +114,9 @@ public <T> T getFeature(final Class<T> type) {
         if(type == PathContainerService.class) {
             return (T) new DirectoryDelimiterPathContainerService();
         }
+        if(type == ComparisonService.class) {
+            return (T) new DefaultComparisonService(new ChainedComparisonService(new ChecksumComparisonService(), new ETagComparisonService()), ComparisonService.disabled);
+        }
         return super.getFeature(type);
     }
 }

azure/src/test/java/ch/cyberduck/core/azure/AzureAttributesFinderFeatureTest.java

@@ -9,6 +9,7 @@
 import ch.cyberduck.core.PathAttributes;
 import ch.cyberduck.core.exception.NotfoundException;
 import ch.cyberduck.core.features.Delete;
+import ch.cyberduck.core.io.MD5ChecksumCompute;
 import ch.cyberduck.core.transfer.TransferStatus;
 import ch.cyberduck.test.IntegrationTest;
 
@@ -42,10 +43,12 @@ public void testNotFound() throws Exception {
     public void testFind() 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 AzureTouchFeature(session).touch(new AzureWriteFeature(session), test, new TransferStatus());
+        new AzureTouchFeature(session).touch(new AzureWriteFeature(session), test, new TransferStatus()
+                .setChecksum(new MD5ChecksumCompute().compute("")));
         final AzureAttributesFinderFeature f = new AzureAttributesFinderFeature(session);
         final PathAttributes attributes = f.find(test);
         assertEquals(0L, attributes.getSize());
+        assertEquals("d41d8cd98f00b204e9800998ecf8427e", attributes.getChecksum().hash);
         assertNotNull(attributes.getETag());
         new AzureDeleteFeature(session).delete(Collections.singletonList(test), new DisabledLoginCallback(), new Delete.DisabledCallback());
     }

dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxProtocol.java

@@ -19,6 +19,9 @@
 import ch.cyberduck.core.LocaleFactory;
 import ch.cyberduck.core.Protocol;
 import ch.cyberduck.core.Scheme;
+import ch.cyberduck.core.synchronization.ChecksumComparisonService;
+import ch.cyberduck.core.synchronization.ComparisonService;
+import ch.cyberduck.core.synchronization.DefaultComparisonService;
 
 import com.google.auto.service.AutoService;
 
@@ -90,4 +93,13 @@ public Scheme getScheme() {
     public Case getCaseSensitivity() {
         return Case.insensitive;
     }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getFeature(final Class<T> type) {
+        if(type == ComparisonService.class) {
+            return (T) new DefaultComparisonService(new ChecksumComparisonService(), ComparisonService.disabled);
+        }
+        return super.getFeature(type);
+    }
 }

dropbox/src/test/java/ch/cyberduck/core/dropbox/DropboxMoveFeatureTest.java

@@ -63,6 +63,8 @@ public void testMoveFile() throws Exception {
         assertNotEquals(target.attributes().getVersionId(), file.attributes().getVersionId());
         assertEquals(target.attributes().getModificationDate(), file.attributes().getModificationDate());
         final PathAttributes targetAttributes = new DropboxAttributesFinderFeature(session).find(target);
+        assertEquals(file.attributes().getChecksum(), target.attributes().getChecksum());
+        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());

googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveProtocol.java

@@ -19,6 +19,9 @@
 import ch.cyberduck.core.LocaleFactory;
 import ch.cyberduck.core.Protocol;
 import ch.cyberduck.core.Scheme;
+import ch.cyberduck.core.synchronization.ChecksumComparisonService;
+import ch.cyberduck.core.synchronization.ComparisonService;
+import ch.cyberduck.core.synchronization.DefaultComparisonService;
 
 import com.google.auto.service.AutoService;
 
@@ -85,4 +88,14 @@ public DirectoryTimestamp getDirectoryTimestamp() {
     public VersioningMode getVersioningMode() {
         return VersioningMode.storage;
     }
+
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getFeature(final Class<T> type) {
+        if(type == ComparisonService.class) {
+            return (T) new DefaultComparisonService(new ChecksumComparisonService(), ComparisonService.disabled);
+        }
+        return super.getFeature(type);
+    }
 }

googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveMoveFeatureTest.java

@@ -58,14 +58,19 @@ public void testMoveFile() throws Exception {
         final DriveFileIdProvider fileid = new DriveFileIdProvider(session);
         final Path test = new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), new Path(DriveHomeFinderService.MYDRIVE_FOLDER, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());
         final String id = test.attributes().getFileId();
-        final Path folder = new Path(DriveHomeFinderService.MYDRIVE_FOLDER, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory));
-        new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid), folder, new TransferStatus());
+        final Path folder = new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid),
+                new Path(DriveHomeFinderService.MYDRIVE_FOLDER, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
+        assertEquals(folder.attributes(), new DriveAttributesFinderFeature(session, fileid).find(folder));
         final Path target = new DriveMoveFeature(session, fileid).move(test, new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus(), new Delete.DisabledCallback(), new DisabledConnectionCallback());
         assertEquals(id, target.attributes().getFileId());
+        assertEquals(test.attributes().getChecksum(), target.attributes().getChecksum());
+        assertNotEquals(test.attributes().getModificationDate(), target.attributes().getModificationDate());
         final Find find = new DefaultFindFeature(session);
         assertFalse(find.find(test));
         assertTrue(find.find(target));
+        assertEquals(folder.attributes(), new DriveAttributesFinderFeature(session, fileid).find(folder));
         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());
     }

googledrive/src/test/java/ch/cyberduck/core/googledrive/DriveWriteFeatureTest.java

@@ -55,6 +55,8 @@ public void testWrite() throws Exception {
         final DriveFileIdProvider idProvider = new DriveFileIdProvider(session);
         final Path folder = new DriveDirectoryFeature(session, idProvider).mkdir(
                 new DriveWriteFeature(session, idProvider), new Path(DriveHomeFinderService.MYDRIVE_FOLDER, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)), new TransferStatus());
+        final PathAttributes folderAttributes = new DriveAttributesFinderFeature(session, idProvider).find(folder);
+        assertEquals(folderAttributes, folder.attributes());
         final Path test = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
         String fileid;
         {
@@ -83,6 +85,7 @@ public void testWrite() throws Exception {
             assertArrayEquals(content, buffer);
             assertEquals("x-application/cyberduck", session.getClient().files().get(test.attributes().getFileId()).execute().getMimeType());
         }
+        assertEquals(folderAttributes, new DriveAttributesFinderFeature(session, idProvider).find(folder));
         {
             // overwrite
             final TransferStatus status = new TransferStatus();

googlestorage/src/main/java/ch/cyberduck/core/googlestorage/GoogleStorageProtocol.java

@@ -24,17 +24,12 @@
 import ch.cyberduck.core.Protocol;
 import ch.cyberduck.core.Scheme;
 import ch.cyberduck.core.features.Location;
-import ch.cyberduck.core.synchronization.ChainedComparisonService;
-import ch.cyberduck.core.synchronization.Comparison;
 import ch.cyberduck.core.synchronization.ComparisonService;
 import ch.cyberduck.core.synchronization.DefaultComparisonService;
 import ch.cyberduck.core.synchronization.ETagComparisonService;
-import ch.cyberduck.core.synchronization.SizeComparisonService;
-import ch.cyberduck.core.synchronization.TimestampComparisonService;
 import ch.cyberduck.core.text.DefaultLexicographicOrderComparator;
 
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -138,10 +133,7 @@ public <T> T getFeature(final Class<T> type) {
             return (T) new DirectoryDelimiterPathContainerService();
         }
         if(type == ComparisonService.class) {
-            return (T) new DefaultComparisonService(new ChainedComparisonService(EnumSet.of(Comparison.unknown, Comparison.notequal),
-                    new ETagComparisonService(),
-                    new ChainedComparisonService(
-                            EnumSet.of(Comparison.unknown, Comparison.equal), new TimestampComparisonService(), new SizeComparisonService())), ComparisonService.disabled);
+            return (T) new DefaultComparisonService(new ETagComparisonService(), ComparisonService.disabled);
         }
         return super.getFeature(type);
     }

hubic/src/main/java/ch/cyberduck/core/hubic/HubicProtocol.java

@@ -15,16 +15,14 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.AbstractProtocol;
 import ch.cyberduck.core.LocaleFactory;
 import ch.cyberduck.core.Protocol;
-import ch.cyberduck.core.Scheme;
 import ch.cyberduck.core.openstack.SwiftProtocol;
 
 import com.google.auto.service.AutoService;
 
 @AutoService(Protocol.class)
-public class HubicProtocol extends AbstractProtocol {
+public class HubicProtocol extends SwiftProtocol {
 
     @Override
     public String getIdentifier() {
@@ -36,11 +34,6 @@ public String getDescription() {
         return "hubiC";
     }
 
-    @Override
-    public Scheme getScheme() {
-        return Scheme.https;
-    }
-
     @Override
     public Type getType() {
         return Type.swift;
@@ -76,11 +69,6 @@ public String getPasswordPlaceholder() {
         return LocaleFactory.localizedString("Authorization code", "Credentials");
     }
 
-    @Override
-    public DirectoryTimestamp getDirectoryTimestamp() {
-        return DirectoryTimestamp.explicit;
-    }
-
     @Override
     public boolean isUsernameConfigurable() {
         return false;