Return copy with updated attributes not modifying parameter.

dkocher · dkocher · commit 56bf0098c993 · 2025-03-04T14:59:13.000+01:00
diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2CopyFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2CopyFeature.java
@@ -55,7 +55,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
                     containerService.getKey(target));
             listener.sent(status.getLength());
             fileid.cache(target, response.getFileId());
-            return target.withAttributes(new B2AttributesFinderFeature(session, fileid).toAttributes(response));
+            return new Path(target).withAttributes(new B2AttributesFinderFeature(session, fileid).toAttributes(response));
         }
         catch(B2ApiException e) {
             throw new B2ExceptionMappingService(fileid).map("Cannot copy {0}", e, source);
diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeCopyFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeCopyFeature.java
@@ -44,14 +44,14 @@
 import java.util.Map;
 import java.util.concurrent.Future;
 
-import synapticloop.b2.exception.B2ApiException;
-import synapticloop.b2.response.B2StartLargeFileResponse;
-import synapticloop.b2.response.B2UploadPartResponse;
-
 import static ch.cyberduck.core.b2.B2LargeUploadService.X_BZ_INFO_LARGE_FILE_SHA1;
 import static ch.cyberduck.core.b2.B2MetadataFeature.X_BZ_INFO_SRC_CREATION_DATE_MILLIS;
 import static ch.cyberduck.core.b2.B2MetadataFeature.X_BZ_INFO_SRC_LAST_MODIFIED_MILLIS;
 
+import synapticloop.b2.exception.B2ApiException;
+import synapticloop.b2.response.B2StartLargeFileResponse;
+import synapticloop.b2.response.B2UploadPartResponse;
+
 public class B2LargeCopyFeature implements Copy {
     private static final Logger log = LogManager.getLogger(B2LargeCopyFeature.class);
 
@@ -129,7 +129,7 @@ public int compare(final B2UploadPartResponse o1, final B2UploadPartResponse o2)
             session.getClient().finishLargeFileUpload(response.getFileId(), checksums.toArray(new String[checksums.size()]));
             log.info("Finished large file upload {} with {} parts", target, completed.size());
             fileid.cache(target, response.getFileId());
-            return target.withAttributes(new PathAttributes(source.attributes()).withVersionId(response.getFileId()));
+            return new Path(target).withAttributes(new PathAttributes(source.attributes()).withVersionId(response.getFileId()));
         }
         catch(B2ApiException e) {
             throw new B2ExceptionMappingService(fileid).map("Cannot copy {0}", e, source);
diff --git a/box/src/main/java/ch/cyberduck/core/box/BoxCopyFeature.java b/box/src/main/java/ch/cyberduck/core/box/BoxCopyFeature.java
@@ -68,7 +68,7 @@ public Path copy(final Path file, final Path target, final TransferStatus status
                                 BoxAttributesFinderFeature.DEFAULT_FIELDS)
                 ));
             }
-            return target.withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(
+            return new Path(target).withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(
                     new FilesApi(new BoxApiClient(session.getClient())).postFilesIdCopy(
                             fileid.getFileId(file),
                             new FileIdCopyBody()
diff --git a/box/src/main/java/ch/cyberduck/core/box/BoxMoveFeature.java b/box/src/main/java/ch/cyberduck/core/box/BoxMoveFeature.java
@@ -71,7 +71,7 @@ id, new FoldersFolderIdBody()
                         null, BoxAttributesFinderFeature.DEFAULT_FIELDS);
                 fileid.cache(file, null);
                 fileid.cache(renamed, id);
-                return renamed.withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(result));
+                return new Path(renamed).withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(result));
             }
             final File result = new FilesApi(new BoxApiClient(session.getClient())).putFilesId(
                     id, new FilesFileIdBody()
@@ -81,7 +81,7 @@ id, new FilesFileIdBody()
                     null, BoxAttributesFinderFeature.DEFAULT_FIELDS);
             fileid.cache(file, null);
             fileid.cache(renamed, id);
-            return renamed.withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(result));
+            return new Path(renamed).withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(result));
         }
         catch(ApiException e) {
             throw new BoxExceptionMappingService(fileid).map("Cannot rename {0}", e, file);
diff --git a/brick/src/main/java/ch/cyberduck/core/brick/BrickCopyFeature.java b/brick/src/main/java/ch/cyberduck/core/brick/BrickCopyFeature.java
@@ -61,7 +61,7 @@ public Path copy(final Path file, final Path target, final TransferStatus status
             if(entity.getFileMigrationId() != null) {
                 this.poll(client, entity);
             }
-            return target.withAttributes(file.attributes());
+            return new Path(target).withAttributes(file.attributes());
         }
         catch(ApiException e) {
             throw new BrickExceptionMappingService().map("Cannot copy {0}", e, file);
diff --git a/brick/src/main/java/ch/cyberduck/core/brick/BrickMoveFeature.java b/brick/src/main/java/ch/cyberduck/core/brick/BrickMoveFeature.java
@@ -59,7 +59,7 @@ public Path move(final Path file, final Path target, final TransferStatus status
             if(entity.getFileMigrationId() != null) {
                 this.poll(client, entity);
             }
-            return target.withAttributes(file.attributes());
+            return new Path(target).withAttributes(file.attributes());
         }
         catch(ApiException e) {
             throw new BrickExceptionMappingService().map("Cannot rename {0}", e, file);
diff --git a/core/src/main/java/ch/cyberduck/core/worker/MoveWorker.java b/core/src/main/java/ch/cyberduck/core/worker/MoveWorker.java
@@ -133,9 +133,11 @@ public void delete(final Path file) {
                         };
                         final Path moved = feature.move(r.getKey(), r.getValue(), status, delete, callback);
                         if(PathAttributes.EMPTY.equals(moved.attributes())) {
-                            moved.withAttributes(session.getFeature(AttributesFinder.class).find(moved));
+                            result.put(r.getKey(), new Path(moved).withAttributes(session.getFeature(AttributesFinder.class).find(moved)));
+                        }
+                        else {
+                            result.put(r.getKey(), moved);
                         }
-                        result.put(r.getKey(), moved);
                         final HostPreferences preferences = HostPreferencesFactory.get(session.getHost());
                         if(preferences.getBoolean("versioning.enable") && preferences.getBoolean("versioning.move.enable")) {
                             switch(session.getHost().getProtocol().getVersioningMode()) {
diff --git a/deepbox/src/main/java/ch/cyberduck/core/deepbox/DeepboxCopyFeature.java b/deepbox/src/main/java/ch/cyberduck/core/deepbox/DeepboxCopyFeature.java
@@ -67,7 +67,7 @@ public Path copy(final Path file, final Path target, final TransferStatus status
                 new CoreRestControllerApi(session.getClient()).updateNode(nodeUpdate, copied.getNodeId());
             }
             listener.sent(status.getLength());
-            return target.withAttributes(new DeepboxAttributesFinderFeature(session, fileid).toAttributes(copied));
+            return new Path(target).withAttributes(new DeepboxAttributesFinderFeature(session, fileid).toAttributes(copied));
         }
         catch(ApiException e) {
             throw new DeepboxExceptionMappingService(fileid).map("Cannot copy {0}", e, file);
diff --git a/deepbox/src/main/java/ch/cyberduck/core/deepbox/DeepboxMoveFeature.java b/deepbox/src/main/java/ch/cyberduck/core/deepbox/DeepboxMoveFeature.java
@@ -74,7 +74,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
             }
             fileid.cache(file, null);
             fileid.cache(renamed, sourceId);
-            return renamed.withAttributes(new PathAttributes(file.attributes()).withFileId(sourceId));
+            return new Path(renamed).withAttributes(new PathAttributes(file.attributes()).withFileId(sourceId));
         }
         catch(ApiException e) {
             throw new DeepboxExceptionMappingService(fileid).map("Cannot rename {0}", e, file);
diff --git a/dracoon/src/main/java/ch/cyberduck/core/sds/SDSCopyFeature.java b/dracoon/src/main/java/ch/cyberduck/core/sds/SDSCopyFeature.java
@@ -71,7 +71,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
             nodeid.cache(target, null);
             final PathAttributes attributes = new SDSAttributesFinderFeature(session, nodeid).find(target);
             nodeid.cache(target, attributes.getVersionId());
-            return target.withAttributes(attributes);
+            return new Path(target).withAttributes(attributes);
         }
         catch(ApiException e) {
             throw new SDSExceptionMappingService(nodeid).map("Cannot copy {0}", e, source);
diff --git a/dracoon/src/main/java/ch/cyberduck/core/sds/SDSDelegatingCopyFeature.java b/dracoon/src/main/java/ch/cyberduck/core/sds/SDSDelegatingCopyFeature.java
@@ -55,7 +55,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
         }
         final Path result = copy.copy(source, target, status, callback, listener);
         nodeid.cache(target, null);
-        return result.withAttributes(new SDSAttributesFinderFeature(session, nodeid).find(result));
+        return new Path(result).withAttributes(new SDSAttributesFinderFeature(session, nodeid).find(result));
     }
 
     @Override
diff --git a/dracoon/src/main/java/ch/cyberduck/core/sds/SDSMoveFeature.java b/dracoon/src/main/java/ch/cyberduck/core/sds/SDSMoveFeature.java
@@ -70,7 +70,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
                         new UpdateRoomRequest().name(renamed.getName()), nodeId, StringUtils.EMPTY, null);
                 nodeid.cache(renamed, file.attributes().getVersionId());
                 nodeid.cache(file, null);
-                return renamed.withAttributes(new SDSAttributesAdapter(session).toAttributes(node));
+                return new Path(renamed).withAttributes(new SDSAttributesAdapter(session).toAttributes(node));
             }
             else {
                 if(new SimplePathPredicate(file.getParent()).test(renamed.getParent())) {
@@ -102,7 +102,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
                 nodeid.cache(renamed, file.attributes().getVersionId());
                 nodeid.cache(file, null);
                 // Copy original file attributes
-                return renamed.withAttributes(new PathAttributes(file.attributes()).withVersionId(String.valueOf(nodeId)));
+                return new Path(renamed).withAttributes(new PathAttributes(file.attributes()).withVersionId(String.valueOf(nodeId)));
             }
         }
         catch(ApiException e) {
diff --git a/dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxCopyFeature.java b/dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxCopyFeature.java
@@ -34,12 +34,12 @@
 import java.util.EnumSet;
 import java.util.Optional;
 
+import static ch.cyberduck.core.features.Copy.validate;
+
 import com.dropbox.core.DbxException;
 import com.dropbox.core.v2.files.DbxUserFilesRequests;
 import com.dropbox.core.v2.files.RelocationResult;
 
-import static ch.cyberduck.core.features.Copy.validate;
-
 public class DropboxCopyFeature implements Copy {
     private static final Logger log = LogManager.getLogger(DropboxCopyFeature.class);
 
@@ -61,7 +61,7 @@ public Path copy(final Path file, final Path target, final TransferStatus status
             // If the source path is a folder all its contents will be copied.
             final RelocationResult result = new DbxUserFilesRequests(session.getClient(file)).copyV2(containerService.getKey(file), containerService.getKey(target));
             listener.sent(status.getLength());
-            return target.withAttributes(new DropboxAttributesFinderFeature(session).toAttributes(result.getMetadata()));
+            return new Path(target).withAttributes(new DropboxAttributesFinderFeature(session).toAttributes(result.getMetadata()));
         }
         catch(DbxException e) {
             throw new DropboxExceptionMappingService().map("Cannot copy {0}", e, file);
diff --git a/dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxMoveFeature.java b/dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxMoveFeature.java
@@ -59,7 +59,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
                 }
             }
             final RelocationResult result = new DbxUserFilesRequests(session.getClient(file)).moveV2(containerService.getKey(file), containerService.getKey(renamed));
-            return renamed.withAttributes(new DropboxAttributesFinderFeature(session).toAttributes(result.getMetadata()));
+            return new Path(renamed).withAttributes(new DropboxAttributesFinderFeature(session).toAttributes(result.getMetadata()));
         }
         catch(DbxException e) {
             throw new DropboxExceptionMappingService().map("Cannot move {0}", e, file);
diff --git a/ftp/src/main/java/ch/cyberduck/core/ftp/FTPMoveFeature.java b/ftp/src/main/java/ch/cyberduck/core/ftp/FTPMoveFeature.java
@@ -50,7 +50,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
                 throw new FTPException(session.getClient().getReplyCode(), session.getClient().getReplyString());
             }
             // Copy original file attributes
-            return renamed.withAttributes(file.attributes());
+            return new Path(renamed).withAttributes(file.attributes());
         }
         catch(IOException e) {
             throw new FTPExceptionMappingService().map("Cannot rename {0}", e, file);
diff --git a/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveCopyFeature.java b/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveCopyFeature.java
@@ -52,7 +52,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
                     .setSupportsAllDrives(HostPreferencesFactory.get(session.getHost()).getBoolean("googledrive.teamdrive.enable")).execute();
             listener.sent(status.getLength());
             fileid.cache(target, copy.getId());
-            return target.withAttributes(new DriveAttributesFinderFeature(session, fileid).toAttributes(copy));
+            return new Path(target).withAttributes(new DriveAttributesFinderFeature(session, fileid).toAttributes(copy));
         }
         catch(IOException e) {
             throw new DriveExceptionMappingService(fileid).map("Cannot copy {0}", e, source);
diff --git a/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveMoveFeature.java b/googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveMoveFeature.java
@@ -90,7 +90,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
             }
             fileid.cache(file, null);
             fileid.cache(renamed, id);
-            return renamed.withAttributes(new DriveAttributesFinderFeature(session, fileid).toAttributes(result));
+            return new Path(renamed).withAttributes(new DriveAttributesFinderFeature(session, fileid).toAttributes(result));
         }
         catch(IOException e) {
             throw new DriveExceptionMappingService(fileid).map("Cannot rename {0}", e, file);
diff --git a/googlestorage/src/main/java/ch/cyberduck/core/googlestorage/GoogleStorageCopyFeature.java b/googlestorage/src/main/java/ch/cyberduck/core/googlestorage/GoogleStorageCopyFeature.java
@@ -74,7 +74,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
             }
             while(!response.getDone());
             listener.sent(status.getLength());
-            return target.withAttributes(new GoogleStorageAttributesFinderFeature(session).toAttributes(response.getResource()));
+            return new Path(target).withAttributes(new GoogleStorageAttributesFinderFeature(session).toAttributes(response.getResource()));
         }
         catch(IOException e) {
             throw new GoogleStorageExceptionMappingService().map("Cannot copy {0}", e, source);
diff --git a/manta/src/main/java/ch/cyberduck/core/manta/MantaMoveFeature.java b/manta/src/main/java/ch/cyberduck/core/manta/MantaMoveFeature.java
@@ -47,7 +47,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
         try {
             session.getClient().move(file.getAbsolute(), renamed.getAbsolute());
             // Copy original file attributes
-            return renamed.withAttributes(file.attributes());
+            return new Path(renamed).withAttributes(file.attributes());
         }
         catch(MantaException e) {
             throw new MantaExceptionMappingService().map("Cannot rename {0}", e, file);
diff --git a/onedrive/src/main/java/ch/cyberduck/core/onedrive/features/GraphCopyFeature.java b/onedrive/src/main/java/ch/cyberduck/core/onedrive/features/GraphCopyFeature.java
@@ -80,7 +80,7 @@ public Path copy(final Path file, final Path target, final TransferStatus status
             target.attributes().setFileId(null);
             final PathAttributes attr = attributes.find(target);
             fileid.cache(target, attr.getFileId());
-            return target.withAttributes(attr);
+            return new Path(target).withAttributes(attr);
         }
         catch(OneDriveAPIException e) {
             throw new GraphExceptionMappingService(fileid).map("Cannot copy {0}", e, file);
diff --git a/onedrive/src/main/java/ch/cyberduck/core/onedrive/features/GraphMoveFeature.java b/onedrive/src/main/java/ch/cyberduck/core/onedrive/features/GraphMoveFeature.java
@@ -86,7 +86,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
             final PathAttributes attributes = new GraphAttributesFinderFeature(session, fileid).toAttributes(metadata);
             fileid.cache(file, null);
             fileid.cache(renamed, attributes.getFileId());
-            return renamed.withAttributes(attributes);
+            return new Path(renamed).withAttributes(attributes);
         }
         catch(OneDriveAPIException e) {
             throw new GraphExceptionMappingService(fileid).map("Cannot rename {0}", e, file);
diff --git a/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftDefaultCopyFeature.java b/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftDefaultCopyFeature.java
@@ -62,7 +62,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
                     containerService.getContainer(target).getName(), containerService.getKey(target));
             listener.sent(status.getLength());
             // Copy original file attributes
-            return target.withAttributes(source.attributes());
+            return new Path(target).withAttributes(source.attributes());
         }
         catch(GenericException e) {
             throw new SwiftExceptionMappingService().map("Cannot copy {0}", e, source);
diff --git a/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftLargeObjectCopyFeature.java b/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftLargeObjectCopyFeature.java
@@ -64,7 +64,7 @@ public SwiftLargeObjectCopyFeature(final SwiftSession session, final SwiftRegion
 
     @Override
     public Path copy(final Path source, final Path target, final TransferStatus status, final ConnectionCallback callback, final StreamListener listener) throws BackgroundException {
-        return copy(source, segmentService.list(source), target, status, callback, listener);
+        return this.copy(source, segmentService.list(source), target, status, callback, listener);
     }
 
     @Override
@@ -129,6 +129,6 @@ public Path copy(final Path source, final List<Path> sourceParts, final Path tar
         }
         final PathAttributes attributes = new PathAttributes(source.attributes());
         attributes.setChecksum(new Checksum(HashAlgorithm.md5, stored.getMd5sum()));
-        return new Path(target.getParent(), target.getName(), target.getType(), attributes);
+        return new Path(target).withAttributes(attributes);
     }
 }
diff --git a/s3/src/main/java/ch/cyberduck/core/s3/S3CopyFeature.java b/s3/src/main/java/ch/cyberduck/core/s3/S3CopyFeature.java
@@ -86,7 +86,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
         destination.setBucketName(bucket.isRoot() ? StringUtils.EMPTY : bucket.getName());
         destination.replaceAllMetadata(new HashMap<>(new S3MetadataFeature(session, acl).getMetadata(source)));
         final String versionId = this.copy(source, destination, status, listener);
-        return target.withAttributes(new PathAttributes(source.attributes()).withVersionId(
+        return new Path(target).withAttributes(new PathAttributes(source.attributes()).withVersionId(
                 HostPreferencesFactory.get(session.getHost()).getBoolean("s3.listing.versioning.enable") ? versionId : null));
     }
 
diff --git a/smb/src/main/java/ch/cyberduck/core/smb/SMBMoveFeature.java b/smb/src/main/java/ch/cyberduck/core/smb/SMBMoveFeature.java
@@ -71,7 +71,7 @@ public Path move(final Path source, final Path target, final TransferStatus stat
             session.releaseShare(share);
         }
         // Copy original file attributes
-        return target.withAttributes(source.attributes());
+        return new Path(target).withAttributes(source.attributes());
     }
 
     @Override
diff --git a/ssh/src/main/java/ch/cyberduck/core/sftp/SFTPMoveFeature.java b/ssh/src/main/java/ch/cyberduck/core/sftp/SFTPMoveFeature.java
@@ -46,7 +46,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
             session.sftp().rename(file.getAbsolute(), renamed.getAbsolute(),
                     status.isExists() ? new HashSet<>(Arrays.asList(RenameFlags.OVERWRITE, RenameFlags.NATIVE)) : Collections.singleton(RenameFlags.NATIVE));
             // Copy original file attributes
-            return renamed.withAttributes(file.attributes());
+            return new Path(renamed).withAttributes(file.attributes());
         }
         catch(IOException e) {
             throw new SFTPExceptionMappingService().map("Cannot rename {0}", e, file);
diff --git a/storegate/src/main/java/ch/cyberduck/core/storegate/StoregateCopyFeature.java b/storegate/src/main/java/ch/cyberduck/core/storegate/StoregateCopyFeature.java
@@ -52,7 +52,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
                     fileid.getFileId(source), copy);
             listener.sent(status.getLength());
             fileid.cache(target, file.getId());
-            return target.withAttributes(new StoregateAttributesFinderFeature(session, fileid).toAttributes(file));
+            return new Path(target).withAttributes(new StoregateAttributesFinderFeature(session, fileid).toAttributes(file));
         }
         catch(ApiException e) {
             throw new StoregateExceptionMappingService(fileid).map("Cannot copy {0}", e, source);
diff --git a/storegate/src/main/java/ch/cyberduck/core/storegate/StoregateMoveFeature.java b/storegate/src/main/java/ch/cyberduck/core/storegate/StoregateMoveFeature.java
@@ -75,7 +75,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
                         final PathAttributes attr = new PathAttributes(file.attributes());
                         fileid.cache(file, null);
                         fileid.cache(renamed, attr.getFileId());
-                        return renamed.withAttributes(attr);
+                        return new Path(renamed).withAttributes(attr);
                     default:
                         throw new StoregateExceptionMappingService(fileid).map("Cannot rename {0}",
                                 new ApiException(response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase()), file);
diff --git a/webdav/src/main/java/ch/cyberduck/core/dav/DAVCopyFeature.java b/webdav/src/main/java/ch/cyberduck/core/dav/DAVCopyFeature.java
diff --git a/webdav/src/main/java/ch/cyberduck/core/dav/DAVMoveFeature.java b/webdav/src/main/java/ch/cyberduck/core/dav/DAVMoveFeature.java

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat`
`55`	`55`	`containerService.getKey(target));`
`56`	`56`	`listener.sent(status.getLength());`
`57`	`57`	`fileid.cache(target, response.getFileId());`
`58`		`- return target.withAttributes(new B2AttributesFinderFeature(session, fileid).toAttributes(response));`
	`58`	`+ return new Path(target).withAttributes(new B2AttributesFinderFeature(session, fileid).toAttributes(response));`
`59`	`59`	`}`
`60`	`60`	`catch(B2ApiException e) {`
`61`	`61`	`throw new B2ExceptionMappingService(fileid).map("Cannot copy {0}", e, source);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public Path copy(final Path file, final Path target, final TransferStatus status`
`68`	`68`	`BoxAttributesFinderFeature.DEFAULT_FIELDS)`
`69`	`69`	`));`
`70`	`70`	`}`
`71`		`- return target.withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(`
	`71`	`+ return new Path(target).withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(`
`72`	`72`	`new FilesApi(new BoxApiClient(session.getClient())).postFilesIdCopy(`
`73`	`73`	`fileid.getFileId(file),`
`74`	`74`	`new FileIdCopyBody()`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public Path copy(final Path file, final Path target, final TransferStatus status`
`61`	`61`	`if(entity.getFileMigrationId() != null) {`
`62`	`62`	`this.poll(client, entity);`
`63`	`63`	`}`
`64`		`- return target.withAttributes(file.attributes());`
	`64`	`+ return new Path(target).withAttributes(file.attributes());`
`65`	`65`	`}`
`66`	`66`	`catch(ApiException e) {`
`67`	`67`	`throw new BrickExceptionMappingService().map("Cannot copy {0}", e, file);`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public Path move(final Path file, final Path target, final TransferStatus status`
`59`	`59`	`if(entity.getFileMigrationId() != null) {`
`60`	`60`	`this.poll(client, entity);`
`61`	`61`	`}`
`62`		`- return target.withAttributes(file.attributes());`
	`62`	`+ return new Path(target).withAttributes(file.attributes());`
`63`	`63`	`}`
`64`	`64`	`catch(ApiException e) {`
`65`	`65`	`throw new BrickExceptionMappingService().map("Cannot rename {0}", e, file);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public Path copy(final Path file, final Path target, final TransferStatus status`
`67`	`67`	`new CoreRestControllerApi(session.getClient()).updateNode(nodeUpdate, copied.getNodeId());`
`68`	`68`	`}`
`69`	`69`	`listener.sent(status.getLength());`
`70`		`- return target.withAttributes(new DeepboxAttributesFinderFeature(session, fileid).toAttributes(copied));`
	`70`	`+ return new Path(target).withAttributes(new DeepboxAttributesFinderFeature(session, fileid).toAttributes(copied));`
`71`	`71`	`}`
`72`	`72`	`catch(ApiException e) {`
`73`	`73`	`throw new DeepboxExceptionMappingService(fileid).map("Cannot copy {0}", e, file);`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu`
`74`	`74`	`}`
`75`	`75`	`fileid.cache(file, null);`
`76`	`76`	`fileid.cache(renamed, sourceId);`
`77`		`- return renamed.withAttributes(new PathAttributes(file.attributes()).withFileId(sourceId));`
	`77`	`+ return new Path(renamed).withAttributes(new PathAttributes(file.attributes()).withFileId(sourceId));`
`78`	`78`	`}`
`79`	`79`	`catch(ApiException e) {`
`80`	`80`	`throw new DeepboxExceptionMappingService(fileid).map("Cannot rename {0}", e, file);`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public Path copy(final Path source, final Path target, final TransferStatus stat`
`71`	`71`	`nodeid.cache(target, null);`
`72`	`72`	`final PathAttributes attributes = new SDSAttributesFinderFeature(session, nodeid).find(target);`
`73`	`73`	`nodeid.cache(target, attributes.getVersionId());`
`74`		`- return target.withAttributes(attributes);`
	`74`	`+ return new Path(target).withAttributes(attributes);`
`75`	`75`	`}`
`76`	`76`	`catch(ApiException e) {`
`77`	`77`	`throw new SDSExceptionMappingService(nodeid).map("Cannot copy {0}", e, source);`