Set checksum from filter stream after upload.

Author: dkocher

backblaze/src/test/java/ch/cyberduck/core/worker/B2ConcurrentTransferWorkerTest.java

@@ -113,7 +113,7 @@ public Session create() {
                             final B2LargeUploadService upload = new B2LargeUploadService(this, new B2VersionIdProvider(this)
                             ) {
                                 @Override
-                                protected InputStream decorate(final InputStream in, final UploadFilterOptions options) {
+                                protected InputStream decorate(final InputStream in, final TransferStatus status, final UploadFilterOptions options) {
                                     if(failed.get()) {
                                         // Second attempt successful
                                         return in;

backblaze/src/test/java/ch/cyberduck/core/worker/B2SingleTransferWorkerTest.java

@@ -41,14 +41,7 @@
 import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader;
 import ch.cyberduck.core.ssl.DefaultX509KeyManager;
 import ch.cyberduck.core.ssl.DefaultX509TrustManager;
-import ch.cyberduck.core.transfer.DisabledTransferErrorCallback;
-import ch.cyberduck.core.transfer.DisabledTransferPrompt;
-import ch.cyberduck.core.transfer.Transfer;
-import ch.cyberduck.core.transfer.TransferAction;
-import ch.cyberduck.core.transfer.TransferItem;
-import ch.cyberduck.core.transfer.TransferOptions;
-import ch.cyberduck.core.transfer.TransferSpeedometer;
-import ch.cyberduck.core.transfer.UploadTransfer;
+import ch.cyberduck.core.transfer.*;
 import ch.cyberduck.core.transfer.upload.UploadFilterOptions;
 import ch.cyberduck.test.IntegrationTest;
 import ch.cyberduck.test.VaultTest;
@@ -110,7 +103,7 @@ public String getProperty(final String key) {
             final B2LargeUploadService upload = new B2LargeUploadService(this, new B2VersionIdProvider(this)
             ) {
                 @Override
-                protected InputStream decorate(final InputStream in, final UploadFilterOptions options) {
+                protected InputStream decorate(final InputStream in, final TransferStatus status, final UploadFilterOptions options) {
                     if(failed.get()) {
                         // Second attempt successful
                         return in;

core/src/main/java/ch/cyberduck/core/shared/DefaultUploadFeature.java

@@ -27,6 +27,7 @@
 import ch.cyberduck.core.features.Upload;
 import ch.cyberduck.core.features.Write;
 import ch.cyberduck.core.io.BandwidthThrottle;
+import ch.cyberduck.core.io.Checksum;
 import ch.cyberduck.core.io.StatusOutputStream;
 import ch.cyberduck.core.io.StreamCancelation;
 import ch.cyberduck.core.io.StreamCopier;
@@ -36,6 +37,7 @@
 import ch.cyberduck.core.transfer.TransferStatus;
 import ch.cyberduck.core.transfer.upload.UploadFilterOptions;
 
+import org.apache.commons.codec.binary.Hex;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -59,7 +61,7 @@ public Reply upload(final Write<Reply> write, final Path file, final Local local
     protected Reply transfer(final Write<Reply> write, final Path file, final Local local, final BandwidthThrottle throttle, final StreamListener listener,
                              final TransferStatus status, final StreamCancelation cancel, final StreamProgress progress,
                              final ConnectionCallback callback, final UploadFilterOptions options) throws BackgroundException {
-        final InputStream in = this.decorate(local.getInputStream(), options);
+        final InputStream in = this.decorate(local.getInputStream(), status, options);
         final StatusOutputStream<Reply> out = write.write(file, status, callback);
         new StreamCopier(cancel, progress)
                 .withOffset(status.getOffset())
@@ -73,10 +75,11 @@ protected Reply transfer(final Write<Reply> write, final Path file, final Local
      * Wrap input stream if checksum calculation is enabled.
      *
      * @param in      File input stream
+     * @param status
      * @param options
      * @return Wrapped or same stream
      */
-    protected InputStream decorate(final InputStream in, final UploadFilterOptions options) throws BackgroundException {
+    protected InputStream decorate(final InputStream in, final TransferStatus status, final UploadFilterOptions options) throws BackgroundException {
         if(options.checksum) {
             final MessageDigest digest;
             try {
@@ -86,7 +89,13 @@ protected InputStream decorate(final InputStream in, final UploadFilterOptions o
                 throw new DefaultIOExceptionMappingService().map(e);
             }
             if(null != digest) {
-                return new DigestInputStream(in, digest);
+                return new DigestInputStream(in, digest) {
+                    @Override
+                    public void close() throws IOException {
+                        super.close();
+                        status.setChecksum(Checksum.parse(Hex.encodeHexString(digest.digest())));
+                    }
+                };
             }
         }
         return in;

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

@@ -26,6 +26,7 @@
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Delete;
 import ch.cyberduck.core.io.BandwidthThrottle;
+import ch.cyberduck.core.transfer.Transfer;
 import ch.cyberduck.core.transfer.TransferStatus;
 import ch.cyberduck.core.transfer.upload.UploadFilterOptions;
 import ch.cyberduck.test.IntegrationTest;
@@ -81,9 +82,9 @@ public void testDecorate() throws Exception {
         final NullInputStream n = new NullInputStream(1L);
         assertSame(NullInputStream.class, new DropboxUploadFeature() {
             @Override
-            protected InputStream decorate(final InputStream in, final UploadFilterOptions options) throws BackgroundException {
-                return super.decorate(in, options);
+            protected InputStream decorate(final InputStream in, final TransferStatus status, final UploadFilterOptions options) throws BackgroundException {
+                return super.decorate(in, status, options);
             }
-        }.decorate(n, new UploadFilterOptions(session.getHost())).getClass());
+        }.decorate(n, new TransferStatus(), new UploadFilterOptions(session.getHost())).getClass());
     }
 }

openstack/src/test/java/ch/cyberduck/core/worker/SwiftSingleTransferWorkerTest.java

@@ -38,14 +38,7 @@
 import ch.cyberduck.core.openstack.SwiftSession;
 import ch.cyberduck.core.ssl.DefaultX509KeyManager;
 import ch.cyberduck.core.ssl.DisabledX509TrustManager;
-import ch.cyberduck.core.transfer.DisabledTransferErrorCallback;
-import ch.cyberduck.core.transfer.DisabledTransferPrompt;
-import ch.cyberduck.core.transfer.Transfer;
-import ch.cyberduck.core.transfer.TransferAction;
-import ch.cyberduck.core.transfer.TransferItem;
-import ch.cyberduck.core.transfer.TransferOptions;
-import ch.cyberduck.core.transfer.TransferSpeedometer;
-import ch.cyberduck.core.transfer.UploadTransfer;
+import ch.cyberduck.core.transfer.*;
 import ch.cyberduck.core.transfer.upload.UploadFilterOptions;
 import ch.cyberduck.test.IntegrationTest;
 import ch.cyberduck.test.VaultTest;
@@ -101,7 +94,7 @@ public <T> T _getFeature(final Class<T> type) {
                     final SwiftRegionService regionService = new SwiftRegionService(this);
                     return (T) new SwiftLargeObjectUploadFeature(this, regionService, 1024L * 1024L, 5) {
                         @Override
-                        protected InputStream decorate(final InputStream in, final UploadFilterOptions options) {
+                        protected InputStream decorate(final InputStream in, final TransferStatus status, final UploadFilterOptions options) {
                             if(failed.get()) {
                                 // Second attempt successful
                                 return in;

s3/src/test/java/ch/cyberduck/core/worker/S3SingleTransferWorkerTest.java

@@ -147,7 +147,7 @@ public <T> T _getFeature(final Class<T> type) {
                 if(type == Upload.class) {
                     return (T) new S3MultipartUploadService(this, new S3AccessControlListFeature(this), 5 * 1024L * 1024L, 5) {
                         @Override
-                        protected InputStream decorate(final InputStream in, final UploadFilterOptions options) {
+                        protected InputStream decorate(final InputStream in, final TransferStatus status, final UploadFilterOptions options) {
                             if(failed.get()) {
                                 // Second attempt successful
                                 return in;
@@ -225,7 +225,7 @@ public <T> T _getFeature(final Class<T> type) {
                 if(type == Upload.class) {
                     return (T) new S3SingleUploadService(this) {
                         @Override
-                        protected InputStream decorate(final InputStream in, final UploadFilterOptions options) {
+                        protected InputStream decorate(final InputStream in, final TransferStatus status, final UploadFilterOptions options) {
                             if(failed.get()) {
                                 // Second attempt successful
                                 return in;