From dc0a60b1786977bf5ca5ef1945383e40538a5ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E7=A6=B9=E5=85=89?= <zhaoyuguang@apache.org>
Date: Mon, 19 Aug 2019 11:42:06 +0800
Subject: [PATCH] Optional value should only be accessed after calling
 isPresent()

---
 .../oss/resource/OssStorageResource.java      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java
index 6137b2d5..91a53171 100644
--- a/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java
+++ b/spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java
@@ -16,6 +16,14 @@
 
 package com.alibaba.alicloud.oss.resource;
 
+import com.aliyun.oss.ClientException;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSException;
+import com.aliyun.oss.model.Bucket;
+import com.aliyun.oss.model.OSSObject;
+import org.springframework.core.io.Resource;
+import org.springframework.util.Assert;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -23,15 +31,7 @@ import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-
-import org.springframework.core.io.Resource;
-import org.springframework.util.Assert;
-
-import com.aliyun.oss.ClientException;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSException;
-import com.aliyun.oss.model.Bucket;
-import com.aliyun.oss.model.OSSObject;
+import java.util.Optional;
 
 /**
  * Implements {@link Resource} for reading and writing objects in Aliyun Object Storage
@@ -155,9 +155,9 @@ public class OssStorageResource implements Resource {
 	 * @return the bucket if it exists, or null otherwise
 	 */
 	public Bucket getBucket() {
-		return this.oss.listBuckets().stream()
-				.filter(bucket -> bucket.getName().equals(this.bucketName)).findFirst()
-				.get();
+		Optional<Bucket> value = this.oss.listBuckets().stream()
+				.filter(bucket -> bucket.getName().equals(this.bucketName)).findFirst();
+		return value.orElse(null);
 	}
 
 	/**