Skip to content

Commit 17f7036

Browse files
committed
Drop support for stream based checksum calculation.
1 parent 9da71ef commit 17f7036

File tree

7 files changed

+0
-106
lines changed

7 files changed

+0
-106
lines changed

azure/src/main/java/ch/cyberduck/core/azure/AzureUploadFeature.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424

2525
import com.azure.storage.blob.models.BlobType;
2626

27-
import java.io.IOException;
28-
import java.security.MessageDigest;
29-
import java.security.NoSuchAlgorithmException;
30-
3127
public class AzureUploadFeature extends DefaultUploadFeature<Void> {
3228

3329
private final AzureSession session;
@@ -48,13 +44,4 @@ public Write.Append append(final Path file, final TransferStatus status) throws
4844
return Write.override;
4945
}
5046

51-
@Override
52-
protected MessageDigest digest() throws IOException {
53-
try {
54-
return MessageDigest.getInstance("MD5");
55-
}
56-
catch(NoSuchAlgorithmException e) {
57-
throw new IOException(e.getMessage(), e);
58-
}
59-
}
6047
}

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,8 @@
1717

1818
import ch.cyberduck.core.http.HttpUploadFeature;
1919

20-
import java.io.IOException;
21-
import java.security.MessageDigest;
22-
import java.security.NoSuchAlgorithmException;
23-
2420
import synapticloop.b2.response.BaseB2Response;
2521

2622
public class B2SingleUploadService extends HttpUploadFeature<BaseB2Response> {
2723

28-
@Override
29-
protected MessageDigest digest() throws IOException {
30-
try {
31-
return MessageDigest.getInstance("SHA1");
32-
}
33-
catch(NoSuchAlgorithmException e) {
34-
throw new IOException(e.getMessage(), e);
35-
}
36-
}
3724
}

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919
*/
2020

2121
import ch.cyberduck.core.ConnectionCallback;
22-
import ch.cyberduck.core.DefaultIOExceptionMappingService;
2322
import ch.cyberduck.core.Local;
2423
import ch.cyberduck.core.Path;
2524
import ch.cyberduck.core.ProgressListener;
2625
import ch.cyberduck.core.exception.BackgroundException;
2726
import ch.cyberduck.core.features.Upload;
2827
import ch.cyberduck.core.features.Write;
2928
import ch.cyberduck.core.io.BandwidthThrottle;
30-
import ch.cyberduck.core.io.Checksum;
3129
import ch.cyberduck.core.io.StatusOutputStream;
3230
import ch.cyberduck.core.io.StreamCancelation;
3331
import ch.cyberduck.core.io.StreamCopier;
@@ -37,14 +35,10 @@
3735
import ch.cyberduck.core.transfer.TransferStatus;
3836
import ch.cyberduck.core.transfer.upload.UploadFilterOptions;
3937

40-
import org.apache.commons.codec.binary.Hex;
4138
import org.apache.logging.log4j.LogManager;
4239
import org.apache.logging.log4j.Logger;
4340

44-
import java.io.IOException;
4541
import java.io.InputStream;
46-
import java.security.DigestInputStream;
47-
import java.security.MessageDigest;
4842

4943
public class DefaultUploadFeature<Reply> implements Upload<Reply> {
5044
private static final Logger log = LogManager.getLogger(DefaultUploadFeature.class);
@@ -80,28 +74,6 @@ protected Reply transfer(final Write<Reply> write, final Path file, final Local
8074
* @return Wrapped or same stream
8175
*/
8276
protected InputStream decorate(final InputStream in, final TransferStatus status, final UploadFilterOptions options) throws BackgroundException {
83-
if(options.checksum) {
84-
final MessageDigest digest;
85-
try {
86-
digest = this.digest();
87-
}
88-
catch(IOException e) {
89-
throw new DefaultIOExceptionMappingService().map(e);
90-
}
91-
if(null != digest) {
92-
return new DigestInputStream(in, digest) {
93-
@Override
94-
public void close() throws IOException {
95-
super.close();
96-
status.setChecksum(Checksum.parse(Hex.encodeHexString(digest.digest())));
97-
}
98-
};
99-
}
100-
}
10177
return in;
10278
}
103-
104-
protected MessageDigest digest() throws IOException {
105-
return null;
106-
}
10779
}

dropbox/src/main/java/ch/cyberduck/core/dropbox/DropboxUploadFeature.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,8 @@
1818

1919
import ch.cyberduck.core.http.HttpUploadFeature;
2020

21-
import java.io.IOException;
22-
import java.security.MessageDigest;
23-
import java.security.NoSuchAlgorithmException;
24-
2521
import com.dropbox.core.v2.files.Metadata;
2622

2723
public class DropboxUploadFeature extends HttpUploadFeature<Metadata> {
2824

29-
@Override
30-
protected MessageDigest digest() throws IOException {
31-
try {
32-
return new DropboxContentHasher(MessageDigest.getInstance("SHA-256"), MessageDigest.getInstance("SHA-256"), 0);
33-
}
34-
catch(NoSuchAlgorithmException e) {
35-
throw new IOException(e.getMessage(), e);
36-
}
37-
}
3825
}

googledrive/src/main/java/ch/cyberduck/core/googledrive/DriveUploadFeature.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@
1919

2020
import com.google.api.services.drive.model.File;
2121

22-
import java.io.IOException;
23-
import java.security.MessageDigest;
24-
import java.security.NoSuchAlgorithmException;
25-
2622
public class DriveUploadFeature extends HttpUploadFeature<File> {
2723

28-
@Override
29-
protected MessageDigest digest() throws IOException {
30-
try {
31-
return MessageDigest.getInstance("MD5");
32-
}
33-
catch(NoSuchAlgorithmException e) {
34-
throw new IOException(e.getMessage(), e);
35-
}
36-
}
3724
}

openstack/src/main/java/ch/cyberduck/core/openstack/SwiftSmallObjectUploadFeature.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,8 @@
1919

2020
import ch.cyberduck.core.http.HttpUploadFeature;
2121

22-
import java.io.IOException;
23-
import java.security.MessageDigest;
24-
import java.security.NoSuchAlgorithmException;
25-
2622
import ch.iterate.openstack.swift.model.StorageObject;
2723

2824
public class SwiftSmallObjectUploadFeature extends HttpUploadFeature<StorageObject> {
2925

30-
@Override
31-
protected MessageDigest digest() throws IOException {
32-
try {
33-
return MessageDigest.getInstance("MD5");
34-
}
35-
catch(NoSuchAlgorithmException e) {
36-
throw new IOException(e.getMessage(), e);
37-
}
38-
}
3926
}

s3/src/main/java/ch/cyberduck/core/s3/S3SingleUploadService.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
import org.apache.logging.log4j.Logger;
3838
import org.jets3t.service.model.StorageObject;
3939

40-
import java.io.IOException;
41-
import java.security.MessageDigest;
42-
import java.security.NoSuchAlgorithmException;
43-
4440
public class S3SingleUploadService extends HttpUploadFeature<StorageObject> {
4541
private static final Logger log = LogManager.getLogger(S3SingleUploadService.class);
4642

@@ -80,13 +76,4 @@ public StorageObject upload(final Write<StorageObject> write, final Path file, f
8076
}
8177
}
8278

83-
@Override
84-
protected MessageDigest digest() throws IOException {
85-
try {
86-
return MessageDigest.getInstance("MD5");
87-
}
88-
catch(NoSuchAlgorithmException e) {
89-
throw new IOException(e.getMessage(), e);
90-
}
91-
}
9279
}

0 commit comments

Comments
 (0)