Spring/spring-integration-aws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-11: Base64 encoding instead of Hex

Browse Source 
Fixes #11 (https://github.com/spring-projects/spring-integration-aws/issues/11)

Polishing
This commit is contained in:
kjordan2001
2015-07-16 21:07:20 -04:00
committed by Artem Bilan
parent c4d7acf349
commit 2ce8197038
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/springframework/integration/aws/s3/core/AbstractAmazonS3Operations.java
View File

@@ -22,7 +22,6 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -35,6 +34,8 @@ import org.springframework.integration.aws.core.AWSCommonUtils;
import org.springframework.integration.aws.core.AWSCredentials;
import org.springframework.util.Assert;
import com.amazonaws.util.BinaryUtils;
/**
* The common super class for any implementation of {@link AmazonS3Operations}. The sub class
* has to implement all the functionality for performing the actual work to add, remove, update
@@ -306,14 +307,7 @@ public abstract class AbstractAmazonS3Operations implements AmazonS3Operations,
//later in inbound-channel-adapter where we cant find the MD5 sum of the
//multipart upload file from its ETag
String stringContentMD5 = null;
try {
stringContentMD5 =
AWSCommonUtils.encodeHex(AWSCommonUtils.getContentsMD5AsBytes(file));
}
catch (UnsupportedEncodingException e) {
logger.error("Exception while generating the content's MD5 of the file " + file.getAbsolutePath(), e);
}
String stringContentMD5 = BinaryUtils.toBase64(AWSCommonUtils.getContentsMD5AsBytes(file));
try {
doPut(bucketName, key, file, s3Object.getObjectACL(),