Merge pull request #66 from aliyun/fix-callback

fix callback

Author: baiyubin2020

.travis.yml

@@ -5,9 +5,7 @@ jdk:
 - oraclejdk7
 - oraclejdk8
 script:
-- mvn verify
-after_success:
-- mvn clean cobertura:cobertura coveralls:report
+- mvn install -DskipTests=true
 env:
   global:
   - secure: ZSoc2bFoKqWEFRxMhuGawQLv1wYeOOHdF6QQmJOgFW8CnJC/LJ54QjttxEy5NAShq4YsVM7AiAtMqsqUlv8aBi0mFZBKCZToJ9Gvpu3nIUHTIzf9KQpeADbkEA/LQSYWTAjvNnuB0iatkTEZBRKkUCM4dX0Wh3gNORDrwxA6IuMpCdmGPvXrNhoQ7jbZwMj09O/77jNrrbWwUPk3SHNo9NMHv3GA6YHu4kwADCDi3r3syXrosjJR/wC2fsoF+NLP/Kp4lgh3GQoJ/JZDdK6lh16l50nA6uAwm1hPIzTiPpghW5TwG12Yb3jnrAe3MK08rmkClR9UgNSdjqz14VGAFXL68jAgzcmp4kX08c+myWrn+2Zh2u+pR+ORr67OBQ5nZqHQC3B9c9IM5w0l7H2TijDGmcSv34nFuaLjGeIHri9Sq3788qOBrVU7ztDlSkYdlEkUteYSuConv4KZFRBeoB2yvwvpSw6jOk2k1EjPf1AuHAFR0MNuuaX9csO2G2hvb7Z2dmsE2f6OLWuEM9cg/ORBMMzcBIGk3aGJKjLTwvhAzuvq76XPo3nRyiSnTyPm5YYREXK6lEdqrOOihFDUWmtHFbt2jo9f28/ZdcIvUcGUuZCzikRT1zUGvErUr62QPtOQ6c3tNqSkyW/5Gwie/5AhqgSjwh5dBxeCBX6xSMI=

README.md

@@ -2,11 +2,10 @@
 
 [![GitHub version](https://badge.fury.io/gh/aliyun%2Faliyun-oss-java-sdk.svg)](https://badge.fury.io/gh/aliyun%2Faliyun-oss-java-sdk)
 [![Build Status](https://travis-ci.org/aliyun/aliyun-oss-java-sdk.svg?branch=master)](https://travis-ci.org/aliyun/aliyun-oss-java-sdk)
-[![Coverage Status](https://coveralls.io/repos/github/aliyun/aliyun-oss-java-sdk/badge.svg?branch=master)](https://coveralls.io/github/aliyun/aliyun-oss-java-sdk?branch=master)
 
 ## Requirements
 
-- Java 6+
+- Java 1.6+
 
 ## Build
 
@@ -18,7 +17,7 @@ mvn clean package -DskipTests
 
 - to run function tests, you will have to config user account in src/test/java/com/aliyun/oss/integrationtests/TestConfig.java
 
-## Authors && Contributors
+## Authors
 
 - [Yubin Bai](https://github.com/baiyubin)
 - [Mengbang Xing](https://github.com/xingfeng2510)

src/main/java/com/aliyun/oss/internal/OSSObjectOperation.java

@@ -96,6 +96,7 @@
 import com.aliyun.oss.common.utils.ExceptionFactory;
 import com.aliyun.oss.common.utils.HttpHeaders;
 import com.aliyun.oss.common.utils.HttpUtil;
+import com.aliyun.oss.common.utils.IOUtils;
 import com.aliyun.oss.common.utils.RangeSpec;
 import com.aliyun.oss.event.ProgressEventType;
 import com.aliyun.oss.event.ProgressInputStream;
@@ -146,7 +147,7 @@ public PutObjectResult putObject(PutObjectRequest putObjectRequest)
             result = writeObjectInternal(WriteMode.OVERWRITE, putObjectRequest, putObjectCallbackReponseParser);
         }
 
-        if (getInnerClient().getClientConfiguration().isCrcCheckEnabled()) {
+        if (isCrcCheckEnabled()) {
         	OSSUtils.checkChecksum(result.getClientCRC(), result.getServerCRC(), result.getRequestId());
         }
 
@@ -175,7 +176,18 @@ public PutObjectResult putObject(URL signedUrl, InputStream requestContent, long
         request.setHeaders(requestHeaders);
         request.setUseChunkEncoding(useChunkEncoding);
 
-        return doOperation(request, putObjectReponseParser, null, null, true);       
+        PutObjectResult result = null;
+        if (requestHeaders.get(OSSHeaders.OSS_HEADER_CALLBACK) == null) {
+            result = doOperation(request, putObjectReponseParser, null, null, true);    
+        } else {
+            result = doOperation(request, putObjectCallbackReponseParser, null, null, true);    
+        }
+        
+        if (isCrcCheckEnabled()) {
+        	OSSUtils.checkChecksum(result.getClientCRC(), result.getServerCRC(), result.getRequestId());
+        }
+        
+        return result;       
     }
 
     /**
@@ -193,8 +205,7 @@ public AppendObjectResult appendObject(AppendObjectRequest appendObjectRequest)
                     (result.getNextPosition() - appendObjectRequest.getPosition())));
         }
 
-        if (getInnerClient().getClientConfiguration().isCrcCheckEnabled() && 
-        		appendObjectRequest.getInitCRC() != null) {
+        if (isCrcCheckEnabled() && appendObjectRequest.getInitCRC() != null) {
         	OSSUtils.checkChecksum(result.getClientCRC(), result.getServerCRC(), result.getRequestId());
         }
 
@@ -295,6 +306,11 @@ public ObjectMetadata getObject(GetObjectRequest getObjectRequest, File file)
                 outputStream.write(buffer, 0, bytesRead);
             }
 
+            if (isCrcCheckEnabled() && !hasRangeInRequest(getObjectRequest)) {
+            	Long clientCRC = IOUtils.getCRCValue(ossObject.getObjectContent());
+            	OSSUtils.checkChecksum(clientCRC, ossObject.getServerCRC(), ossObject.getRequestId());
+            }
+            
             return ossObject.getObjectMetadata();
         } catch (IOException ex) {
             logException("Cannot read object content stream: ", ex);
@@ -782,6 +798,14 @@ ResponseType writeObjectInternal(WriteMode mode, RequestType originalRequest,
         }
         return result;
     }
+    
+    private boolean isCrcCheckEnabled() {
+    	return getInnerClient().getClientConfiguration().isCrcCheckEnabled();
+    }
+    
+    private boolean hasRangeInRequest(GetObjectRequest getObjectRequest) {
+    	return getObjectRequest.getHeaders().get(OSSHeaders.RANGE) != null;
+    }    
 
     private static void populateCopyObjectHeaders(CopyObjectRequest copyObjectRequest,
             Map<String, String> headers) {

src/test/java/com/aliyun/oss/integrationtests/CRCChecksumTest.java

@@ -19,6 +19,8 @@
 
 package com.aliyun.oss.integrationtests;
 
+import static com.aliyun.oss.integrationtests.TestUtils.genFixedLengthFile;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -219,6 +221,32 @@ public void testGetObjectCRC() {
 
     }
 
+    @Test
+    public void testGetObjectToFileCRC() {
+        String key = "get-object-to-file-crc";
+
+        try {
+            InputStream inputStream = TestUtils.genFixedLengthInputStream(1024 * 100);
+            PutObjectResult putObjectResult = ossClient.putObject(bucketName, key, inputStream);
+            checkCRC(putObjectResult);
+            
+            String filePath = genFixedLengthFile(0);
+            GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, key);
+            ossClient.getObject(getObjectRequest, new File(filePath));
+            
+            // 范围CRC上不支持
+            getObjectRequest.setRange(100, 10000);
+            getObjectRequest = new GetObjectRequest(bucketName, key);
+            ossClient.getObject(getObjectRequest, new File(filePath));
+                        
+            ossClient.deleteObject(bucketName, key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Assert.fail(e.getMessage());
+        }
+
+    }
+    
     @Test
     public void testEmpytObjectCRC() {
         String key = "empty-object-crc";

src/test/java/com/aliyun/oss/integrationtests/CallbackTest.java

@@ -38,6 +38,7 @@
 import com.aliyun.oss.HttpMethod;
 import com.aliyun.oss.OSSErrorCode;
 import com.aliyun.oss.OSSException;
+import com.aliyun.oss.internal.OSSHeaders;
 import com.aliyun.oss.internal.OSSUtils;
 import com.aliyun.oss.model.Callback;
 import com.aliyun.oss.model.Callback.CalbackBodyType;
@@ -55,6 +56,7 @@
  * Test callBack of PutObject and MultipartUpload
  * 
  */
+@SuppressWarnings("unused")
 public class CallbackTest extends TestBase {
 
     private static final String callbackUrl = "callback.oss-demo.com:23450";
@@ -716,6 +718,7 @@ public void testGeneratePresignedUrlWithCallback() {
 			request.addHeader("x-oss-meta-author", "mingdi");
 
 			URL signedUrl = ossClient.generatePresignedUrl(request);
+			System.out.println("SignedUrl:" + signedUrl);
 
         	// put with url
 			Map<String, String> customHeaders = new HashMap<String, String>(cbHeaders);
@@ -724,7 +727,12 @@ public void testGeneratePresignedUrlWithCallback() {
 
         	InputStream instream = genFixedLengthInputStream(instreamLength);
         	PutObjectResult putResult = ossClient.putObject(signedUrl, instream, instreamLength, customHeaders);
-        	Assert.assertNull(putResult.getCallbackResponseBody());
+        	
+        	// check callback body
+            byte[] buffer = new byte[bufferLength];
+            int nRead = putResult.getCallbackResponseBody().read(buffer);
+            putResult.getCallbackResponseBody().close();
+            Assert.assertEquals(callbackResponse, new String(buffer, 0, nRead));
 
             // get object and check
             OSSObject ossObject = ossClient.getObject(bucketName, key);