Merge pull request #16914 from iterate-ch/feature/MD-23095-attributes

Return copy with updated attributes not modifying parameter

Author: dkocher

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);

backblaze/src/main/java/ch/cyberduck/core/b2/B2DirectoryFeature.java

@@ -66,7 +66,7 @@ public Path mkdir(final Path folder, final TransferStatus status) throws Backgro
                         null == status.getRegion() ? BucketType.valueOf(new B2BucketTypeFeature(session, fileid).getDefault().getIdentifier()) : BucketType.valueOf(status.getRegion()));
                 final EnumSet<Path.Type> type = EnumSet.copyOf(folder.getType());
                 type.add(Path.Type.volume);
-                return folder.withType(type).withAttributes(new B2AttributesFinderFeature(session, fileid).toAttributes(response));
+                return new Path(folder).withType(type).withAttributes(new B2AttributesFinderFeature(session, fileid).toAttributes(response));
             }
             else {
                 final EnumSet<Path.Type> type = EnumSet.copyOf(folder.getType());

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);

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()

box/src/main/java/ch/cyberduck/core/box/BoxDirectoryFeature.java

@@ -42,7 +42,7 @@ public BoxDirectoryFeature(final BoxSession session, final BoxFileidProvider fil
     @Override
     public Path mkdir(final Path folder, final TransferStatus status) throws BackgroundException {
         try {
-            return folder.withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(
+            return new Path(folder).withAttributes(new BoxAttributesFinderFeature(session, fileid).toAttributes(
                     new FoldersApi(new BoxApiClient(session.getClient())).postFolders(new FoldersBody()
                             .parent(new FoldersParent().id(fileid.getFileId(folder.getParent())))
                             .name(folder.getName()), Collections.emptyList())));

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);

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);

brick/src/main/java/ch/cyberduck/core/brick/BrickDirectoryFeature.java

@@ -36,7 +36,7 @@ public BrickDirectoryFeature(final BrickSession session) {
     @Override
     public Path mkdir(final Path folder, final TransferStatus status) throws BackgroundException {
         try {
-            return folder.withAttributes(
+            return new Path(folder).withAttributes(
                     new BrickAttributesFinderFeature(session).toAttributes(new FoldersApi(new BrickApiClient(session))
                             .postFoldersPath(StringUtils.removeStart(folder.getAbsolute(), String.valueOf(Path.DELIMITER)))));
         }

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);

core/src/main/java/ch/cyberduck/core/worker/CreateDirectoryWorker.java

@@ -72,7 +72,7 @@ public Path run(final Session<?> session) throws BackgroundException {
         status.setRegion(region);
         final Path result = feature.mkdir(folder, status);
         if(PathAttributes.EMPTY.equals(result.attributes())) {
-            return result.withAttributes(session.getFeature(AttributesFinder.class).find(result));
+            return new Path(folder).withAttributes(session.getFeature(AttributesFinder.class).find(result));
         }
         return result;
     }