Revert interface changes in stream progress from 6d861cf.

dkocher · dkocher · commit bb837e860c9e · 2025-03-12T16:01:39.000+01:00
diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeUploadService.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2LargeUploadService.java
@@ -186,7 +186,8 @@ public int compare(final B2UploadPartResponse o1, final B2UploadPartResponse o2)
             log.info("Finished large file upload {} with {} parts", file, completed.size());
             fileid.cache(file, response.getFileId());
             // Mark parent status as complete
-            status.setResponse(new B2AttributesFinderFeature(session, fileid).toAttributes(response)).setComplete();
+            status.setResponse(new B2AttributesFinderFeature(session, fileid).toAttributes(response));
+            status.setComplete();
             return response;
         }
         catch(B2ApiException e) {
diff --git a/box/src/main/java/ch/cyberduck/core/box/BoxLargeUploadService.java b/box/src/main/java/ch/cyberduck/core/box/BoxLargeUploadService.java
@@ -111,7 +111,8 @@ public File upload(final Path file, final Local local, final BandwidthThrottle t
             if(optional.isPresent()) {
                 final File commited = optional.get();
                 // Mark parent status as complete
-                status.setResponse(new BoxAttributesFinderFeature(session, fileid).toAttributes(commited)).setComplete();
+                status.setResponse(new BoxAttributesFinderFeature(session, fileid).toAttributes(commited));
+                status.setComplete();
                 return commited;
             }
             throw new NotfoundException(file.getAbsolute());
diff --git a/brick/src/main/java/ch/cyberduck/core/brick/BrickUploadFeature.java b/brick/src/main/java/ch/cyberduck/core/brick/BrickUploadFeature.java
@@ -108,7 +108,8 @@ public FileEntity upload(final Path file, final Local local, final BandwidthThro
             final List<TransferStatus> checksums = Interruptibles.awaitAll(parts);
             final FileEntity entity = this.completeUpload(file, ref, status, checksums);
             // Mark parent status as complete
-            status.setResponse(new BrickAttributesFinderFeature(session).toAttributes(entity)).setComplete();
+            status.setResponse(new BrickAttributesFinderFeature(session).toAttributes(entity));
+            status.setComplete();
             return entity;
         }
         finally {
diff --git a/core/src/main/java/ch/cyberduck/core/http/HttpResponseOutputStream.java b/core/src/main/java/ch/cyberduck/core/http/HttpResponseOutputStream.java
@@ -49,7 +49,8 @@ public void close() throws IOException {
             final Reply response = this.getStatus();
             if(response != null) {
                 log.debug("Closed stream {} with response value {}", this, response);
-                status.setResponse(attributes.toAttributes(response)).setComplete();
+                status.setResponse(attributes.toAttributes(response));
+                status.setComplete();
             }
         }
         catch(BackgroundException e) {
diff --git a/core/src/main/java/ch/cyberduck/core/io/StreamProgress.java b/core/src/main/java/ch/cyberduck/core/io/StreamProgress.java
@@ -18,22 +18,21 @@
  */
 
 import ch.cyberduck.core.exception.BackgroundException;
-import ch.cyberduck.core.transfer.TransferStatus;
 
 public interface StreamProgress {
-    TransferStatus setComplete();
+    void setComplete();
 
-    TransferStatus setFailure(final BackgroundException failure);
+    void setFailure(final BackgroundException failure);
 
     StreamProgress noop = new StreamProgress() {
         @Override
-        public TransferStatus setComplete() {
-            return null;
+        public void setComplete() {
+            //
         }
 
         @Override
-        public TransferStatus setFailure(final BackgroundException failure) {
-            return null;
+        public void setFailure(final BackgroundException failure) {
+            //
         }
     };
 }
diff --git a/core/src/main/java/ch/cyberduck/core/transfer/DownloadTransfer.java b/core/src/main/java/ch/cyberduck/core/transfer/DownloadTransfer.java
@@ -229,11 +229,12 @@ public void pre(final Session<?> source, final Session<?> destination, final Map
                 progress.message(MessageFormat.format(LocaleFactory.localizedString("Making directory {0}", "Status"), local.getName()));
                 try {
                     new DefaultLocalDirectoryFeature().mkdir(local);
+                    status.setComplete();
                     // Post process of file
                     filter.complete(
                             status.getRename().remote != null ? status.getRename().remote : entry.getKey().remote,
                             status.getRename().local != null ? status.getRename().local : entry.getKey().local,
-                            status.setComplete(), progress);
+                            status, progress);
                 }
                 catch(AccessDeniedException e) {
                     if(error.prompt(entry.getKey(), status, e, files.size())) {
diff --git a/core/src/main/java/ch/cyberduck/core/transfer/ProxyTransferStatus.java b/core/src/main/java/ch/cyberduck/core/transfer/ProxyTransferStatus.java
@@ -40,15 +40,13 @@ public void validate() throws ConnectionCanceledException {
     }
 
     @Override
-    public TransferStatus setComplete() {
+    public void setComplete() {
         progress.setComplete();
-        return this;
     }
 
     @Override
-    public TransferStatus setFailure(final BackgroundException failure) {
+    public void setFailure(final BackgroundException failure) {
         progress.setFailure(failure);
-        return this;
     }
 
     @Override
@@ -57,8 +55,7 @@ public PathAttributes getResponse() {
     }
 
     @Override
-    public TransferStatus setResponse(final PathAttributes attributes) {
+    public void setResponse(final PathAttributes attributes) {
         response.setResponse(attributes);
-        return this;
     }
 }
diff --git a/core/src/main/java/ch/cyberduck/core/transfer/TransferResponse.java b/core/src/main/java/ch/cyberduck/core/transfer/TransferResponse.java
@@ -28,5 +28,5 @@ public interface TransferResponse {
      *
      * @param attributes Metadata
      */
-    TransferStatus setResponse(PathAttributes attributes);
+    void setResponse(PathAttributes attributes);
 }
diff --git a/core/src/main/java/ch/cyberduck/core/transfer/TransferStatus.java b/core/src/main/java/ch/cyberduck/core/transfer/TransferStatus.java
@@ -255,17 +255,15 @@ public boolean isComplete() {
     }
 
     @Override
-    public TransferStatus setComplete() {
+    public void setComplete() {
         complete.set(true);
         done.countDown();
-        return this;
     }
 
     @Override
-    public TransferStatus setFailure(final BackgroundException failure) {
+    public void setFailure(final BackgroundException failure) {
         complete.set(false);
         done.countDown();
-        return this;
     }
 
     /**
@@ -459,9 +457,8 @@ public PathAttributes getResponse() {
     }
 
     @Override
-    public TransferStatus setResponse(PathAttributes attributes) {
+    public void setResponse(PathAttributes attributes) {
         this.response = attributes;
-        return this;
     }
 
     public Permission getPermission() {
diff --git a/core/src/main/java/ch/cyberduck/core/transfer/UploadTransfer.java b/core/src/main/java/ch/cyberduck/core/transfer/UploadTransfer.java
@@ -249,11 +249,12 @@ public int compare(final Map.Entry<TransferItem, TransferStatus> o1, final Map.E
             progress.message(MessageFormat.format(LocaleFactory.localizedString("Making directory {0}", "Status"), file.getName()));
             try {
                 mkdir.mkdir(file, status);
+                status.setComplete();
                 // Post process of file
                 filter.complete(
                         status.getRename().remote != null ? status.getRename().remote : entry.getKey().remote,
                         status.getRename().local != null ? status.getRename().local : entry.getKey().local,
-                        status.setComplete(), progress);
+                        status, progress);
             }
             catch(BackgroundException e) {
                 if(error.prompt(entry.getKey(), status, e, files.size())) {
diff --git a/core/src/main/java/ch/cyberduck/core/worker/AbstractTransferWorker.java b/core/src/main/java/ch/cyberduck/core/worker/AbstractTransferWorker.java
@@ -501,6 +501,7 @@ public TransferStatus call() throws BackgroundException {
                             }
                         }
                         if(complete) {
+                            status.setComplete();
                             final Session<?> source = borrow(Connection.source);
                             final Session<?> destination = borrow(Connection.destination);
                             try {
@@ -510,7 +511,7 @@ public TransferStatus call() throws BackgroundException {
                                 filter.complete(
                                         status.getRename().remote != null ? status.getRename().remote : item.remote,
                                         status.getRename().local != null ? status.getRename().local : item.local,
-                                        status.setComplete(), progress);
+                                        status, progress);
                             }
                             finally {
                                 release(source, Connection.source, null);
diff --git a/core/src/test/java/ch/cyberduck/core/worker/ConcurrentTransferWorkerTest.java b/core/src/test/java/ch/cyberduck/core/worker/ConcurrentTransferWorkerTest.java
@@ -260,7 +260,7 @@ public void testAwait() throws Exception {
                 @Override
                 public TransferStatus call() {
                     entry.countDown();
-                    return new TransferStatus().setComplete();
+                    return new TransferStatus();
                 }
             });
         }
diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoTransferStatus.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoTransferStatus.java
@@ -39,13 +39,12 @@ public CryptoTransferStatus(final CryptoVault vault, final TransferStatus proxy)
     }
 
     @Override
-    public CryptoTransferStatus setResponse(final PathAttributes attributes) {
+    public void setResponse(final PathAttributes attributes) {
         try {
             super.setResponse(attributes.setSize(vault.toCleartextSize(0L, attributes.getSize())));
         }
         catch(CryptoInvalidFilesizeException e) {
             log.warn("Failure {} translating file size from response {}", e, attributes);
         }
-        return this;
     }
 }
diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/features/CryptoCopyFeature.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/features/CryptoCopyFeature.java
@@ -70,11 +70,10 @@ public Path copy(final Path source, final Path copy, final TransferStatus status
                     vault.contains(copy) ? vault.encrypt(session, copy) : copy,
                     vault.contains(copy) ? new TransferStatus(status) {
                         @Override
-                        public TransferStatus setResponse(final PathAttributes attributes) {
+                        public void setResponse(final PathAttributes attributes) {
                             status.setResponse(attributes);
                             // Will be converted back to clear text when decrypting file below set in default copy feature implementation using writer.
                             super.setResponse(new PathAttributes(attributes).setSize(vault.toCiphertextSize(0L, attributes.getSize())));
-                            return this;
                         }
                     } : status,
                     callback, listener);
diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/features/CryptoTouchFeature.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/features/CryptoTouchFeature.java
@@ -51,11 +51,10 @@ public Path touch(final Path file, final TransferStatus status) throws Backgroun
         status.setNonces(new RandomNonceGenerator(vault.getNonceSize()));
         final Path target = proxy.touch(vault.encrypt(session, file), new TransferStatus(status) {
             @Override
-            public TransferStatus setResponse(final PathAttributes attributes) {
+            public void setResponse(final PathAttributes attributes) {
                 status.setResponse(attributes);
                 // Will be converted back to clear text when decrypting file below set in default touch feature implementation using writer.
                 super.setResponse(new PathAttributes(attributes).setSize(vault.toCiphertextSize(0L, attributes.getSize())));
-                return this;
             }
         });
         final Path decrypt = vault.decrypt(session, target);
diff --git a/dracoon/src/main/java/ch/cyberduck/core/sds/SDSUploadService.java b/dracoon/src/main/java/ch/cyberduck/core/sds/SDSUploadService.java
@@ -245,7 +245,8 @@ public void uncaughtException(final Thread t, final Throwable e) {
                                 // Set node id in transfer status
                                 nodeid.cache(file, String.valueOf(uploadStatus.getNode().getId()));
                                 // Mark parent status as complete
-                                status.setResponse(new SDSAttributesAdapter(session).toAttributes(uploadStatus.getNode())).setComplete();
+                                status.setResponse(new SDSAttributesAdapter(session).toAttributes(uploadStatus.getNode()));
+                                status.setComplete();
                                 signal.countDown();
                                 break;
                         }
diff --git a/eue/src/main/java/ch/cyberduck/core/eue/EueLargeUploadService.java b/eue/src/main/java/ch/cyberduck/core/eue/EueLargeUploadService.java
@@ -137,7 +137,8 @@ public EueWriteFeature.Chunk upload(final Path file, final Local local, final Ba
             }
             final EueWriteFeature.Chunk object = new EueWriteFeature.Chunk(resourceId, size, cdash64);
             // Mark parent status as complete
-            status.setResponse(new EueAttributesAdapter().toAttributes(object)).setComplete();
+            status.setResponse(new EueAttributesAdapter().toAttributes(object));
+            status.setComplete();
             return object;
         }
         catch(NoSuchAlgorithmException e) {
diff --git a/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftLargeObjectUploadFeature.java b/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftLargeObjectUploadFeature.java
@@ -183,7 +183,8 @@ public StorageObject upload(final Path file, final Local local,
             // the ETag value of each segment, concatenating them together, and then returning the MD5 checksum of the result.
             stored.setMd5sum(checksum);
             // Mark parent status as complete
-            status.setResponse(new SwiftAttributesFinderFeature(session).toAttributes(stored)).setComplete();
+            status.setResponse(new SwiftAttributesFinderFeature(session).toAttributes(stored));
+            status.setComplete();
             return stored;
         }
         catch(GenericException e) {
diff --git a/s3/src/main/java/ch/cyberduck/core/s3/S3MultipartUploadService.java b/s3/src/main/java/ch/cyberduck/core/s3/S3MultipartUploadService.java
@@ -195,7 +195,8 @@ public StorageObject upload(final Path file, final Local local, final BandwidthT
                 object.addAllMetadata(multipart.getMetadata());
             }
             // Mark parent status as complete
-            status.setResponse(new S3AttributesAdapter(session.getHost()).toAttributes(object)).setComplete();
+            status.setResponse(new S3AttributesAdapter(session.getHost()).toAttributes(object));
+            status.setComplete();
             return object;
         }
         catch(ServiceException e) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ public void close() throws IOException {`
`49`	`49`	`final Reply response = this.getStatus();`
`50`	`50`	`if(response != null) {`
`51`	`51`	`log.debug("Closed stream {} with response value {}", this, response);`
`52`		`- status.setResponse(attributes.toAttributes(response)).setComplete();`
	`52`	`+ status.setResponse(attributes.toAttributes(response));`
	`53`	`+ status.setComplete();`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`catch(BackgroundException e) {`
Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,13 @@ public void validate() throws ConnectionCanceledException {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`		`- public TransferStatus setComplete() {`
	`43`	`+ public void setComplete() {`
`44`	`44`	`progress.setComplete();`
`45`		`- return this;`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`@Override`
`49`		`- public TransferStatus setFailure(final BackgroundException failure) {`
	`48`	`+ public void setFailure(final BackgroundException failure) {`
`50`	`49`	`progress.setFailure(failure);`
`51`		`- return this;`
`52`	`50`	`}`
`53`	`51`
`54`	`52`	`@Override`
`@@ -57,8 +55,7 @@ public PathAttributes getResponse() {`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`@Override`
`60`		`- public TransferStatus setResponse(final PathAttributes attributes) {`
	`58`	`+ public void setResponse(final PathAttributes attributes) {`
`61`	`59`	`response.setResponse(attributes);`
`62`		`- return this;`
`63`	`60`	`}`
`64`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ public interface TransferResponse {`
`28`	`28`	`*`
`29`	`29`	`* @param attributes Metadata`
`30`	`30`	`*/`
`31`		`- TransferStatus setResponse(PathAttributes attributes);`
	`31`	`+ void setResponse(PathAttributes attributes);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,17 +255,15 @@ public boolean isComplete() {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`@Override`
`258`		`- public TransferStatus setComplete() {`
	`258`	`+ public void setComplete() {`
`259`	`259`	`complete.set(true);`
`260`	`260`	`done.countDown();`
`261`		`- return this;`
`262`	`261`	`}`
`263`	`262`
`264`	`263`	`@Override`
`265`		`- public TransferStatus setFailure(final BackgroundException failure) {`
	`264`	`+ public void setFailure(final BackgroundException failure) {`
`266`	`265`	`complete.set(false);`
`267`	`266`	`done.countDown();`
`268`		`- return this;`
`269`	`267`	`}`
`270`	`268`
`271`	`269`	`/**`
`@@ -459,9 +457,8 @@ public PathAttributes getResponse() {`
`459`	`457`	`}`
`460`	`458`
`461`	`459`	`@Override`
`462`		`- public TransferStatus setResponse(PathAttributes attributes) {`
	`460`	`+ public void setResponse(PathAttributes attributes) {`
`463`	`461`	`this.response = attributes;`
`464`		`- return this;`
`465`	`462`	`}`
`466`	`463`
`467`	`464`	`public Permission getPermission() {`