Merge pull request #17325 from iterate-ch/bugfix/MD-24072-versionid-quickxorhash

Use QuickXorHash for version identifier as ctag apparently changes on…

Author: dkocher

onedrive/src/main/java/ch/cyberduck/core/onedrive/features/GraphAttributesFinderFeature.java

@@ -32,7 +32,9 @@
 import org.nuxeo.onedrive.client.OneDriveAPIException;
 import org.nuxeo.onedrive.client.types.DriveItem;
 import org.nuxeo.onedrive.client.types.DriveItemVersion;
+import org.nuxeo.onedrive.client.types.File;
 import org.nuxeo.onedrive.client.types.FileSystemInfo;
+import org.nuxeo.onedrive.client.types.Hashes;
 import org.nuxeo.onedrive.client.types.Publication;
 
 import java.io.IOException;
@@ -89,7 +91,13 @@ private DriveItem.Metadata toMetadata(final Path file, final DriveItem item) thr
     public PathAttributes toAttributes(final DriveItem.Metadata metadata) {
         final PathAttributes attributes = new PathAttributes();
         attributes.setETag(metadata.getETag());
-        attributes.setVersionId(metadata.getcTag());
+        final File file = metadata.getFile();
+        if(file != null) {
+            final Hashes hashes = file.getHashes();
+            if(hashes != null) {
+                attributes.setVersionId(hashes.getQuickXorHash());
+            }
+        }
         Optional<DescriptiveUrl> webUrl = getWebUrl(metadata);
         if(metadata.isPackage()) {
             webUrl.ifPresent(url -> attributes.setSize(UrlFileWriterFactory.get().write(url).getBytes(Charset.defaultCharset()).length));

onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphAttributesFinderFeatureTest.java

@@ -79,7 +79,7 @@ public void testFindDirectory() throws Exception {
         assertNotEquals(-1L, attributes.getCreationDate());
         assertNotEquals(-1L, attributes.getModificationDate());
         assertNotNull(attributes.getETag());
-        assertNotNull(attributes.getVersionId());
+        assertNull(attributes.getVersionId());
         assertNotNull(attributes.getLink());
         assertNotNull(attributes.getFileId());
         new GraphDeleteFeature(session, fileid).delete(Collections.singletonList(file), new DisabledLoginCallback(), new Delete.DisabledCallback());

onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphMoveFeatureTest.java

@@ -83,6 +83,7 @@ public void testRename() throws BackgroundException {
         final Path target = move.move(file, rename, status, new Delete.DisabledCallback(), new DisabledConnectionCallback());
         assertEquals(attributes, target.attributes());
         assertEquals(attributes.getFileId(), target.attributes().getFileId());
+        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());
@@ -111,6 +112,7 @@ public void testMove() throws BackgroundException {
         assertNotNull(renamedAttributes);
         assertEquals(attributes, renamedAttributes);
         assertNotEquals(attributes.getETag(), renamedAttributes.getETag());
+        assertEquals(attributes.getVersionId(), renamedAttributes.getVersionId());
         assertEquals(target.attributes().getETag(), renamedAttributes.getETag());
 
         delete.delete(Collections.singletonList(targetDirectory), new DisabledLoginCallback(), new Delete.DisabledCallback());