Use Task.FromResult

cnblogs-dudu · cnblogs-dudu · commit 9e688c38adde · 2018-08-04T10:37:17.000+08:00
diff --git a/src/Api/Base/BaseObjectCommand.cs b/src/Api/Base/BaseObjectCommand.cs
@@ -7,7 +7,7 @@ namespace Cuiliang.AliyunOssSdk.Api.Base
     /// 对某个对象进行的操作的命令基类，主要是保存了Bucket信息和key
     /// </summary>
     /// <typeparam name="TResult"></typeparam>
-    public abstract class BaseObjectCommand<TResult>: BaseOssCommand<TResult>
+    public abstract class BaseObjectCommand<TResult> : BaseOssCommand<TResult>
     {
         /// <summary>
         /// 对象所处的Bucket
@@ -19,7 +19,7 @@ public abstract class BaseObjectCommand<TResult>: BaseOssCommand<TResult>
         /// </summary>
         public string Key { get; set; }
 
-        public BaseObjectCommand(RequestContext requestContext, 
+        public BaseObjectCommand(RequestContext requestContext,
             BucketInfo bucket,
             string key) : base(requestContext)
         {
diff --git a/src/Api/Object/Append/AppendObjectCommand.cs b/src/Api/Object/Append/AppendObjectCommand.cs
@@ -67,7 +67,7 @@ public override ServiceRequest BuildRequest()
             return req;
         }
 
-        public override async Task<OssResult<AppentObjectResult>> ParseResultAsync(HttpResponseMessage response)
+        public override Task<OssResult<AppentObjectResult>> ParseResultAsync(HttpResponseMessage response)
         {
             var result = new AppentObjectResult();
             result.ETag = response.Headers.ETag?.ToString();
@@ -83,7 +83,7 @@ public override async Task<OssResult<AppentObjectResult>> ParseResultAsync(HttpR
                 result.HashCrc64Ecma = Convert.ToUInt64(response.Headers.GetValues(HttpHeaders.HashCrc64Ecma).FirstOrDefault());
             }
 
-            return new OssResult<AppentObjectResult>(result);
+            return Task.FromResult(new OssResult<AppentObjectResult>(result));
         }
     }
 }
diff --git a/src/Api/Object/Delete/DeleteObjectCommand.cs b/src/Api/Object/Delete/DeleteObjectCommand.cs
@@ -19,9 +19,9 @@ public override ServiceRequest BuildRequest()
             return req;
         }
 
-        public override async Task<OssResult<DeleteObjectResult>> ParseResultAsync(HttpResponseMessage response)
+        public override Task<OssResult<DeleteObjectResult>> ParseResultAsync(HttpResponseMessage response)
         {
-            return new OssResult<DeleteObjectResult>(new DeleteObjectResult());
+            return Task.FromResult(new OssResult<DeleteObjectResult>(new DeleteObjectResult()));
         }
     }
 }
diff --git a/src/Api/Object/Get/GetObjectCommand.cs b/src/Api/Object/Get/GetObjectCommand.cs
@@ -14,36 +14,24 @@ namespace Cuiliang.AliyunOssSdk.Api.Object.Get
 {
     public class GetObjectCommand : BaseObjectCommand<GetObjectResult>
     {
-        
-
         public GetObjectParams Params { get; set; }
 
-
-
-        /// 
-
         public GetObjectCommand(
             RequestContext requestContext,
             BucketInfo bucket,
             string key,
-            GetObjectParams parameters
-            ) : base(requestContext, bucket, key)
+            GetObjectParams parameters) : base(requestContext, bucket, key)
         {
             Params = parameters;
         }
 
         public override ServiceRequest BuildRequest()
         {
-
             var req = new ServiceRequest(Bucket, Key, HttpMethod.Get);
-
             Params?.SetupRequest(req);
-
             return req;
         }
 
-
-
         public override async Task<OssResult<GetObjectResult>> ParseResultAsync(HttpResponseMessage response)
         {
             var result = new GetObjectResult();
@@ -60,7 +48,6 @@ public override async Task<OssResult<GetObjectResult>> ParseResultAsync(HttpResp
 
         private ObjectMetadata Deserialize(HttpResponseMessage response)
         {
-            
             var metadata = new ObjectMetadata();
             foreach (var header in response.Headers)
             {
diff --git a/src/Api/Object/GetMeta/GetObjectMetaCommand.cs b/src/Api/Object/GetMeta/GetObjectMetaCommand.cs
@@ -21,12 +21,14 @@ public override ServiceRequest BuildRequest()
             return req;
         }
 
-        public override async Task<OssResult<GetObjectMetaResult>> ParseResultAsync(HttpResponseMessage response)
+        public override Task<OssResult<GetObjectMetaResult>> ParseResultAsync(HttpResponseMessage response)
         {
-            return new OssResult<GetObjectMetaResult>(new GetObjectMetaResult()
+            var result = new OssResult<GetObjectMetaResult>(new GetObjectMetaResult()
             {
                 Headers = response.Headers
             });
+
+            return Task.FromResult(result);
         }
     }
 }
diff --git a/src/Api/Object/Head/HeadObjectCommand.cs b/src/Api/Object/Head/HeadObjectCommand.cs
@@ -6,10 +6,8 @@
 
 namespace Cuiliang.AliyunOssSdk.Api.Object.Head
 {
-    public class HeadObjectCommand:BaseObjectCommand<HeadObjectResult>
+    public class HeadObjectCommand : BaseObjectCommand<HeadObjectResult>
     {
-        
-
         public HeadObjectCommand(RequestContext requestContext, BucketInfo bucket, string key, HeadObjectParams parameters) : base(requestContext, bucket, key)
         {
             Parameters = parameters;
@@ -26,12 +24,14 @@ public override ServiceRequest BuildRequest()
             return req;
         }
 
-        public override async Task<OssResult<HeadObjectResult>> ParseResultAsync(HttpResponseMessage response)
+        public override Task<OssResult<HeadObjectResult>> ParseResultAsync(HttpResponseMessage response)
         {
-            return new OssResult<HeadObjectResult>(new HeadObjectResult()
+            var result = new OssResult<HeadObjectResult>(new HeadObjectResult()
             {
                 Headers = response.Headers
             });
+
+            return Task.FromResult(result);
         }
     }
 }
diff --git a/src/Api/Object/Put/PutObjectCommand.cs b/src/Api/Object/Put/PutObjectCommand.cs
@@ -27,10 +27,8 @@ public PutObjectCommand(RequestContext requestContext, BucketInfo bucketInfo, st
 
         public override ServiceRequest BuildRequest()
         {
-            var req = new ServiceRequest(Bucket, Key, HttpMethod.Put);
-           
+            var req = new ServiceRequest(Bucket, Key, HttpMethod.Put);           
 
-            // headers
             if (ExtraHeaders != null)
             {
                 foreach (var pair in ExtraHeaders)
@@ -41,7 +39,6 @@ public override ServiceRequest BuildRequest()
 
             RequestContent.Metadata?.Populate(req.Headers);
 
-            //
             req.ContentMd5 = RequestContent.ContentMd5;
 
             if (RequestContent.ContentType == RequestContentType.Stream)
@@ -60,19 +57,19 @@ public override ServiceRequest BuildRequest()
             return req;
         }
 
-        public override async Task<OssResult<PutObjectResult>> ParseResultAsync(HttpResponseMessage response)
+        public override Task<OssResult<PutObjectResult>> ParseResultAsync(HttpResponseMessage response)
         {
             var result = new PutObjectResult();
             if (response.Headers.Contains(HttpHeaders.ETag))
             {
                 result.ETag = OssUtils.TrimQuotes(response.Headers.ETag.ToString());
             }
 
-            return new OssResult<PutObjectResult>()
+            return Task.FromResult(new OssResult<PutObjectResult>()
             {
                 IsSuccess = true,
                 SuccessResult = result
-            };
+            });
         }
     }
 }
diff --git a/src/Api/Object/PutAcl/PutObjectACLCommand.cs b/src/Api/Object/PutAcl/PutObjectACLCommand.cs
@@ -21,15 +21,14 @@ public override ServiceRequest BuildRequest()
 
             req.Parameters.Add("acl", "");
 
-            //
             req.Headers.Add("x-oss-object-acl", AclType);
 
             return req;
         }
 
-        public override async Task<OssResult<EmptyResult>> ParseResultAsync(HttpResponseMessage response)
+        public override Task<OssResult<EmptyResult>> ParseResultAsync(HttpResponseMessage response)
         {
-            return new OssResult<EmptyResult>(new EmptyResult());
+            return Task.FromResult(new OssResult<EmptyResult>(new EmptyResult()));
         }
     }
 }
diff --git a/src/Cuiliang.AliyunOssSdk.csproj b/src/Cuiliang.AliyunOssSdk.csproj
@@ -14,5 +14,6 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
   </ItemGroup>  
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public override ServiceRequest BuildRequest()`
`67`	`67`	`return req;`
`68`	`68`	`}`
`69`	`69`
`70`		`- public override async Task<OssResult<AppentObjectResult>> ParseResultAsync(HttpResponseMessage response)`
	`70`	`+ public override Task<OssResult<AppentObjectResult>> ParseResultAsync(HttpResponseMessage response)`
`71`	`71`	`{`
`72`	`72`	`var result = new AppentObjectResult();`
`73`	`73`	`result.ETag = response.Headers.ETag?.ToString();`
`@@ -83,7 +83,7 @@ public override async Task<OssResult<AppentObjectResult>> ParseResultAsync(HttpR`
`83`	`83`	`result.HashCrc64Ecma = Convert.ToUInt64(response.Headers.GetValues(HttpHeaders.HashCrc64Ecma).FirstOrDefault());`
`84`	`84`	`}`
`85`	`85`
`86`		`- return new OssResult<AppentObjectResult>(result);`
	`86`	`+ return Task.FromResult(new OssResult<AppentObjectResult>(result));`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ public override ServiceRequest BuildRequest()`
`19`	`19`	`return req;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public override async Task<OssResult<DeleteObjectResult>> ParseResultAsync(HttpResponseMessage response)`
	`22`	`+ public override Task<OssResult<DeleteObjectResult>> ParseResultAsync(HttpResponseMessage response)`
`23`	`23`	`{`
`24`		`- return new OssResult<DeleteObjectResult>(new DeleteObjectResult());`
	`24`	`+ return Task.FromResult(new OssResult<DeleteObjectResult>(new DeleteObjectResult()));`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,36 +14,24 @@ namespace Cuiliang.AliyunOssSdk.Api.Object.Get`
`14`	`14`	`{`
`15`	`15`	`public class GetObjectCommand : BaseObjectCommand<GetObjectResult>`
`16`	`16`	`{`
`17`		`-`
`18`		`-`
`19`	`17`	`public GetObjectParams Params { get; set; }`
`20`	`18`
`21`		`-`
`22`		`-`
`23`		`- ///`
`24`		`-`
`25`	`19`	`public GetObjectCommand(`
`26`	`20`	`RequestContext requestContext,`
`27`	`21`	`BucketInfo bucket,`
`28`	`22`	`string key,`
`29`		`- GetObjectParams parameters`
`30`		`- ) : base(requestContext, bucket, key)`
	`23`	`+ GetObjectParams parameters) : base(requestContext, bucket, key)`
`31`	`24`	`{`
`32`	`25`	`Params = parameters;`
`33`	`26`	`}`
`34`	`27`
`35`	`28`	`public override ServiceRequest BuildRequest()`
`36`	`29`	`{`
`37`		`-`
`38`	`30`	`var req = new ServiceRequest(Bucket, Key, HttpMethod.Get);`
`39`		`-`
`40`	`31`	`Params?.SetupRequest(req);`
`41`		`-`
`42`	`32`	`return req;`
`43`	`33`	`}`
`44`	`34`
`45`		`-`
`46`		`-`
`47`	`35`	`public override async Task<OssResult<GetObjectResult>> ParseResultAsync(HttpResponseMessage response)`
`48`	`36`	`{`
`49`	`37`	`var result = new GetObjectResult();`
`@@ -60,7 +48,6 @@ public override async Task<OssResult<GetObjectResult>> ParseResultAsync(HttpResp`
`60`	`48`
`61`	`49`	`private ObjectMetadata Deserialize(HttpResponseMessage response)`
`62`	`50`	`{`
`63`		`-`
`64`	`51`	`var metadata = new ObjectMetadata();`
`65`	`52`	`foreach (var header in response.Headers)`
`66`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,14 @@ public override ServiceRequest BuildRequest()`
`21`	`21`	`return req;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public override async Task<OssResult<GetObjectMetaResult>> ParseResultAsync(HttpResponseMessage response)`
	`24`	`+ public override Task<OssResult<GetObjectMetaResult>> ParseResultAsync(HttpResponseMessage response)`
`25`	`25`	`{`
`26`		`- return new OssResult<GetObjectMetaResult>(new GetObjectMetaResult()`
	`26`	`+ var result = new OssResult<GetObjectMetaResult>(new GetObjectMetaResult()`
`27`	`27`	`{`
`28`	`28`	`Headers = response.Headers`
`29`	`29`	`});`
	`30`	`+`
	`31`	`+ return Task.FromResult(result);`
`30`	`32`	`}`
`31`	`33`	`}`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@`
`6`	`6`
`7`	`7`	`namespace Cuiliang.AliyunOssSdk.Api.Object.Head`
`8`	`8`	`{`
`9`		`- public class HeadObjectCommand:BaseObjectCommand<HeadObjectResult>`
	`9`	`+ public class HeadObjectCommand : BaseObjectCommand<HeadObjectResult>`
`10`	`10`	`{`
`11`		`-`
`12`		`-`
`13`	`11`	`public HeadObjectCommand(RequestContext requestContext, BucketInfo bucket, string key, HeadObjectParams parameters) : base(requestContext, bucket, key)`
`14`	`12`	`{`
`15`	`13`	`Parameters = parameters;`
`@@ -26,12 +24,14 @@ public override ServiceRequest BuildRequest()`
`26`	`24`	`return req;`
`27`	`25`	`}`
`28`	`26`
`29`		`- public override async Task<OssResult<HeadObjectResult>> ParseResultAsync(HttpResponseMessage response)`
	`27`	`+ public override Task<OssResult<HeadObjectResult>> ParseResultAsync(HttpResponseMessage response)`
`30`	`28`	`{`
`31`		`- return new OssResult<HeadObjectResult>(new HeadObjectResult()`
	`29`	`+ var result = new OssResult<HeadObjectResult>(new HeadObjectResult()`
`32`	`30`	`{`
`33`	`31`	`Headers = response.Headers`
`34`	`32`	`});`
	`33`	`+`
	`34`	`+ return Task.FromResult(result);`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,8 @@ public PutObjectCommand(RequestContext requestContext, BucketInfo bucketInfo, st`
`27`	`27`
`28`	`28`	`public override ServiceRequest BuildRequest()`
`29`	`29`	`{`
`30`		`- var req = new ServiceRequest(Bucket, Key, HttpMethod.Put);`
`31`		`-`
	`30`	`+ var req = new ServiceRequest(Bucket, Key, HttpMethod.Put);`
`32`	`31`
`33`		`- // headers`
`34`	`32`	`if (ExtraHeaders != null)`
`35`	`33`	`{`
`36`	`34`	`foreach (var pair in ExtraHeaders)`
`@@ -41,7 +39,6 @@ public override ServiceRequest BuildRequest()`
`41`	`39`
`42`	`40`	`RequestContent.Metadata?.Populate(req.Headers);`
`43`	`41`
`44`		`- //`
`45`	`42`	`req.ContentMd5 = RequestContent.ContentMd5;`
`46`	`43`
`47`	`44`	`if (RequestContent.ContentType == RequestContentType.Stream)`
`@@ -60,19 +57,19 @@ public override ServiceRequest BuildRequest()`
`60`	`57`	`return req;`
`61`	`58`	`}`
`62`	`59`
`63`		`- public override async Task<OssResult<PutObjectResult>> ParseResultAsync(HttpResponseMessage response)`
	`60`	`+ public override Task<OssResult<PutObjectResult>> ParseResultAsync(HttpResponseMessage response)`
`64`	`61`	`{`
`65`	`62`	`var result = new PutObjectResult();`
`66`	`63`	`if (response.Headers.Contains(HttpHeaders.ETag))`
`67`	`64`	`{`
`68`	`65`	`result.ETag = OssUtils.TrimQuotes(response.Headers.ETag.ToString());`
`69`	`66`	`}`
`70`	`67`
`71`		`- return new OssResult<PutObjectResult>()`
	`68`	`+ return Task.FromResult(new OssResult<PutObjectResult>()`
`72`	`69`	`{`
`73`	`70`	`IsSuccess = true,`
`74`	`71`	`SuccessResult = result`
`75`		`- };`
	`72`	`+ });`
`76`	`73`	`}`
`77`	`74`	`}`
`78`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,14 @@ public override ServiceRequest BuildRequest()`
`21`	`21`
`22`	`22`	`req.Parameters.Add("acl", "");`
`23`	`23`
`24`		`- //`
`25`	`24`	`req.Headers.Add("x-oss-object-acl", AclType);`
`26`	`25`
`27`	`26`	`return req;`
`28`	`27`	`}`
`29`	`28`
`30`		`- public override async Task<OssResult<EmptyResult>> ParseResultAsync(HttpResponseMessage response)`
	`29`	`+ public override Task<OssResult<EmptyResult>> ParseResultAsync(HttpResponseMessage response)`
`31`	`30`	`{`
`32`		`- return new OssResult<EmptyResult>(new EmptyResult());`
	`31`	`+ return Task.FromResult(new OssResult<EmptyResult>(new EmptyResult()));`
`33`	`32`	`}`
`34`	`33`	`}`
`35`	`34`	`}`