Merge pull request #94 from aliyun/does_object_exist

fix doesObjectExist
aliyun · Jul 7, 2017 · 5a9a578 · 5a9a578
2 parents 98d5626 + 2fbbbb3
commit 5a9a578
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ The recommended way to use the Aliyun OSS SDK for Java in your project is to con
 <dependency>
     <groupId>com.aliyun.oss</groupId>
     <artifactId>aliyun-sdk-oss</artifactId>
-    <version>2.7.0</version>
+    <version>2.8.0</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.aliyun.oss</groupId>
     <artifactId>aliyun-sdk-oss</artifactId>
-    <version>2.7.0</version>
+    <version>2.8.0</version>
     <packaging>jar</packaging>
     <name>Aliyun OSS SDK for Java</name>
     <description>The Aliyun OSS SDK for Java used for accessing Aliyun Object Storage Service</description>

diff --git a/src/main/java/com/aliyun/oss/OSS.java b/src/main/java/com/aliyun/oss/OSS.java
@@ -584,7 +584,7 @@ public DeleteObjectsResult deleteObjects(DeleteObjectsRequest deleteObjectsReque
             throws OSSException, ClientException;
 
     /**
-     * 判断指定{@link Bucket}下是否存在指定的{@link OSSObject}。
+     * 判断指定{@link Bucket}下是否存在指定的{@link OSSObject}。不受镜像/302跳转或者其它跳转功能的影响。
      * @param bucketName 
      *             Bucket名称。
      * @param key
@@ -596,7 +596,7 @@ public boolean doesObjectExist(String bucketName, String key)
             throws OSSException, ClientException;
 
     /**
-     * 判断指定的{@link OSSObject}是否存在。
+     * 判断指定的{@link OSSObject}在OSS上是否存在。
      * @param genericRequest 
      *             请求参数{@link GenericRequest}实例。
      * @return 
@@ -605,6 +605,16 @@ public boolean doesObjectExist(String bucketName, String key)
     public boolean doesObjectExist(GenericRequest genericRequest)
             throws OSSException, ClientException;
 
+    /**
+     * 判断Object是否存在，并指定是否受镜像/302等其它跳转的影响。
+     * @param bucketName Bucket名称。
+     * @param key Object Key。 
+     * @param isOnlyInOSS true 不受镜像/302等其它跳转的影响，只检查Object是否在OSS中；
+     *              false 受镜像/302跳转的影响，如果OSS中不存在，会根据镜像/302的配置检查Object是否存在。
+     * @return 如果存在返回true，不存在则返回false。
+     */
+    public boolean doesObjectExist(String bucketName, String key, boolean isOnlyInOSS);
+
     /**
      * 判断指定的{@link OSSObject}是否存在。
      * @param headObjectRequest 

diff --git a/src/main/java/com/aliyun/oss/OSSClient.java b/src/main/java/com/aliyun/oss/OSSClient.java
@@ -610,6 +610,15 @@ public boolean doesObjectExist(String bucketName, String key)
         return doesObjectExist(new GenericRequest(bucketName, key));
     }
 
+    @Override
+    public boolean doesObjectExist(String bucketName, String key, boolean isOnlyInOSS) {
+        if (isOnlyInOSS) {
+            return doesObjectExist(bucketName, key);
+        } else {
+            return objectOperation.doesObjectExistWithRedirect(bucketName, key);
+        }
+    }
+
     @Deprecated
     @Override
     public boolean doesObjectExist(HeadObjectRequest headObjectRequest)
@@ -620,16 +629,7 @@ public boolean doesObjectExist(HeadObjectRequest headObjectRequest)
     @Override
     public boolean doesObjectExist(GenericRequest genericRequest)
             throws OSSException, ClientException {
-        try {
-            getSimplifiedObjectMeta(genericRequest);
-            return true;
-        } catch (OSSException e) {
-            if (e.getErrorCode().equals(OSSErrorCode.NO_SUCH_BUCKET)
-                    || e.getErrorCode().equals(OSSErrorCode.NO_SUCH_KEY)) {
-                return false;
-            }
-            throw e;
-        }
+        return objectOperation.doesObjectExist(genericRequest);
     }
 
     @Override

diff --git a/src/main/java/com/aliyun/oss/internal/OSSObjectOperation.java b/src/main/java/com/aliyun/oss/internal/OSSObjectOperation.java
@@ -730,6 +730,44 @@ public GenericResult processObject(ProcessObjectRequest processObjectRequest)
 
         return doOperation(request, ResponseParsers.processObjectResponseParser, bucketName, key, true);
     }
+
+    public boolean doesObjectExist(GenericRequest genericRequest)
+            throws OSSException, ClientException {
+        try {
+            this.getSimplifiedObjectMeta(genericRequest);
+            return true;
+        } catch (OSSException e) {
+            if (e.getErrorCode().equals(OSSErrorCode.NO_SUCH_BUCKET)
+                    || e.getErrorCode().equals(OSSErrorCode.NO_SUCH_KEY)) {
+                return false;
+            }
+            throw e;
+        }
+    }
+
+    public boolean doesObjectExistWithRedirect(String bucketName, String key) 
+            throws OSSException, ClientException {
+        OSSObject ossObject = null;
+        try {
+            GetObjectRequest getObjectRequest = new GetObjectRequest(bucketName, key);
+            ossObject = this.getObject(getObjectRequest);
+            return true;
+        } catch (OSSException e) {
+            if (e.getErrorCode() == OSSErrorCode.NO_SUCH_BUCKET 
+                    || e.getErrorCode() == OSSErrorCode.NO_SUCH_KEY) {
+                return false;
+            }
+            throw e;
+        } finally {
+            if (ossObject != null) {
+                try {
+                    ossObject.forcedClose();
+                } catch (IOException e) {
+                    logException("Forced close failed: ", e);
+                }
+            }
+        }
+    }
 
     private static enum MetadataDirective {
 

diff --git a/src/main/resources/versioninfo.properties b/src/main/resources/versioninfo.properties
@@ -1 +1 @@
-version=2.7.0
+version=2.8.0
diff --git a/src/test/java/com/aliyun/oss/common/utils/VersionUtilTest.java b/src/test/java/com/aliyun/oss/common/utils/VersionUtilTest.java
@@ -28,7 +28,7 @@ public class VersionUtilTest {
     @Test
     public void testGetDefaultUserAgent() { 
         String userAgent = VersionInfoUtils.getDefaultUserAgent();
-        assertTrue(userAgent.startsWith("aliyun-sdk-java/2.7.0("));
+        assertTrue(userAgent.startsWith("aliyun-sdk-java/2.8.0("));
         assertEquals(userAgent.split("/").length, 4);
         assertEquals(userAgent.split(";").length, 2);
         assertEquals(userAgent.split("\\(").length, 2);

diff --git a/src/test/java/com/aliyun/oss/integrationtests/DoesObjectExistTest.java b/src/test/java/com/aliyun/oss/integrationtests/DoesObjectExistTest.java
@@ -57,6 +57,20 @@ public void testExistingBucketAndObject() {
             Assert.fail(e.getMessage());
         }
 
+        try {
+            boolean exist = ossClient.doesObjectExist(bucketName, existingKey, true);
+            Assert.assertTrue(exist);
+        } catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+
+        try {
+            boolean exist = ossClient.doesObjectExist(bucketName, existingKey, false);
+            Assert.assertTrue(exist);
+        } catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+
         // Test another overrided interface
         try {
             boolean exist = ossClient.doesObjectExist(new HeadObjectRequest(bucketName, existingKey));