Address review comments

roji · roji · commit c4810509c836 · 2019-05-23T12:27:46.000+02:00
diff --git a/src/System.Data.Common/src/System/Data/Common/DbCommand.netcoreapp.cs b/src/System.Data.Common/src/System/Data/Common/DbCommand.netcoreapp.cs
@@ -15,24 +15,22 @@ public virtual Task PrepareAsync(CancellationToken cancellationToken = default)
             {
                 return Task.FromCanceled(cancellationToken);
             }
-            else
+
+            try
+            {
+                Prepare();
+                return Task.CompletedTask;
+            }
+            catch (Exception e)
             {
-                try
-                {
-                    Prepare();
-                    return Task.CompletedTask;
-                }
-                catch (Exception e)
-                {
-                    return Task.FromException(e);
-                }
+                return Task.FromException(e);
             }
         }
 
         public virtual ValueTask DisposeAsync()
         {
             Dispose();
-            return new ValueTask(Task.CompletedTask);
+            return default;
         }
     }
 }
diff --git a/src/System.Data.Common/src/System/Data/Common/DbConnection.netcoreapp.cs b/src/System.Data.Common/src/System/Data/Common/DbConnection.netcoreapp.cs
@@ -15,16 +15,14 @@ protected virtual ValueTask<DbTransaction> BeginDbTransactionAsync(IsolationLeve
             {
                 return new ValueTask<DbTransaction>(Task.FromCanceled<DbTransaction>(cancellationToken));
             }
-            else
+
+            try
+            {
+                return new ValueTask<DbTransaction>(BeginDbTransaction(isolationLevel));
+            }
+            catch (Exception e)
             {
-                try
-                {
-                    return new ValueTask<DbTransaction>(BeginDbTransaction(isolationLevel));
-                }
-                catch (Exception e)
-                {
-                    return new ValueTask<DbTransaction>(Task.FromException<DbTransaction>(e));
-                }
+                return new ValueTask<DbTransaction>(Task.FromException<DbTransaction>(e));
             }
         }
 
@@ -40,17 +38,15 @@ public virtual Task ChangeDatabaseAsync(string databaseName, CancellationToken c
             {
                 return Task.FromCanceled(cancellationToken);
             }
-            else
+
+            try
             {
-                try
-                {
-                    ChangeDatabase(databaseName);
-                    return Task.CompletedTask;
-                }
-                catch (Exception e)
-                {
-                    return Task.FromException(e);
-                }
+                ChangeDatabase(databaseName);
+                return Task.CompletedTask;
+            }
+            catch (Exception e)
+            {
+                return Task.FromException(e);
             }
         }
 
@@ -60,24 +56,22 @@ public virtual Task CloseAsync(CancellationToken cancellationToken = default)
             {
                 return Task.FromCanceled(cancellationToken);
             }
-            else
+
+            try
+            {
+                Close();
+                return Task.CompletedTask;
+            }
+            catch (Exception e)
             {
-                try
-                {
-                    Close();
-                    return Task.CompletedTask;
-                }
-                catch (Exception e)
-                {
-                    return Task.FromException(e);
-                }
+                return Task.FromException(e);
             }
         }
 
         public virtual ValueTask DisposeAsync()
         {
             Dispose();
-            return new ValueTask(Task.CompletedTask);
+            return default;
         }
     }
 }
diff --git a/src/System.Data.Common/src/System/Data/Common/DbDataReader.netcoreapp.cs b/src/System.Data.Common/src/System/Data/Common/DbDataReader.netcoreapp.cs
@@ -15,24 +15,22 @@ public virtual Task CloseAsync(CancellationToken cancellationToken = default)
             {
                 return Task.FromCanceled(cancellationToken);
             }
-            else
+
+            try
+            {
+                Close();
+                return Task.CompletedTask;
+            }
+            catch (Exception e)
             {
-                try
-                {
-                    Close();
-                    return Task.CompletedTask;
-                }
-                catch (Exception e)
-                {
-                    return Task.FromException(e);
-                }
+                return Task.FromException(e);
             }
         }
 
         public virtual ValueTask DisposeAsync()
         {
             Dispose();
-            return new ValueTask(Task.CompletedTask);
+            return default;
         }
     }
 }
diff --git a/src/System.Data.Common/src/System/Data/Common/DbTransaction.netcoreapp.cs b/src/System.Data.Common/src/System/Data/Common/DbTransaction.netcoreapp.cs
@@ -15,17 +15,15 @@ public virtual Task CommitAsync(CancellationToken cancellationToken = default)
             {
                 return Task.FromCanceled(cancellationToken);
             }
-            else
+
+            try
+            {
+                Commit();
+                return Task.CompletedTask;
+            }
+            catch (Exception e)
             {
-                try
-                {
-                    Commit();
-                    return Task.CompletedTask;
-                }
-                catch (Exception e)
-                {
-                    return Task.FromException(e);
-                }
+                return Task.FromException(e);
             }
         }
 
@@ -35,24 +33,22 @@ public virtual Task RollbackAsync(CancellationToken cancellationToken = default)
             {
                 return Task.FromCanceled(cancellationToken);
             }
-            else
+
+            try
+            {
+                Rollback();
+                return Task.CompletedTask;
+            }
+            catch (Exception e)
             {
-                try
-                {
-                    Rollback();
-                    return Task.CompletedTask;
-                }
-                catch (Exception e)
-                {
-                    return Task.FromException(e);
-                }
+                return Task.FromException(e);
             }
         }
 
         public virtual ValueTask DisposeAsync()
         {
             Dispose();
-            return new ValueTask(Task.CompletedTask);
+            return default;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,24 +15,22 @@ public virtual Task PrepareAsync(CancellationToken cancellationToken = default)`
`15`	`15`	`{`
`16`	`16`	`return Task.FromCanceled(cancellationToken);`
`17`	`17`	`}`
`18`		`- else`
	`18`	`+`
	`19`	`+ try`
	`20`	`+ {`
	`21`	`+ Prepare();`
	`22`	`+ return Task.CompletedTask;`
	`23`	`+ }`
	`24`	`+ catch (Exception e)`
`19`	`25`	`{`
`20`		`- try`
`21`		`- {`
`22`		`- Prepare();`
`23`		`- return Task.CompletedTask;`
`24`		`- }`
`25`		`- catch (Exception e)`
`26`		`- {`
`27`		`- return Task.FromException(e);`
`28`		`- }`
	`26`	`+ return Task.FromException(e);`
`29`	`27`	`}`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`public virtual ValueTask DisposeAsync()`
`33`	`31`	`{`
`34`	`32`	`Dispose();`
`35`		`- return new ValueTask(Task.CompletedTask);`
	`33`	`+ return default;`
`36`	`34`	`}`
`37`	`35`	`}`
`38`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,14 @@ protected virtual ValueTask<DbTransaction> BeginDbTransactionAsync(IsolationLeve`
`15`	`15`	`{`
`16`	`16`	`return new ValueTask<DbTransaction>(Task.FromCanceled<DbTransaction>(cancellationToken));`
`17`	`17`	`}`
`18`		`- else`
	`18`	`+`
	`19`	`+ try`
	`20`	`+ {`
	`21`	`+ return new ValueTask<DbTransaction>(BeginDbTransaction(isolationLevel));`
	`22`	`+ }`
	`23`	`+ catch (Exception e)`
`19`	`24`	`{`
`20`		`- try`
`21`		`- {`
`22`		`- return new ValueTask<DbTransaction>(BeginDbTransaction(isolationLevel));`
`23`		`- }`
`24`		`- catch (Exception e)`
`25`		`- {`
`26`		`- return new ValueTask<DbTransaction>(Task.FromException<DbTransaction>(e));`
`27`		`- }`
	`25`	`+ return new ValueTask<DbTransaction>(Task.FromException<DbTransaction>(e));`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`
`@@ -40,17 +38,15 @@ public virtual Task ChangeDatabaseAsync(string databaseName, CancellationToken c`
`40`	`38`	`{`
`41`	`39`	`return Task.FromCanceled(cancellationToken);`
`42`	`40`	`}`
`43`		`- else`
	`41`	`+`
	`42`	`+ try`
`44`	`43`	`{`
`45`		`- try`
`46`		`- {`
`47`		`- ChangeDatabase(databaseName);`
`48`		`- return Task.CompletedTask;`
`49`		`- }`
`50`		`- catch (Exception e)`
`51`		`- {`
`52`		`- return Task.FromException(e);`
`53`		`- }`
	`44`	`+ ChangeDatabase(databaseName);`
	`45`	`+ return Task.CompletedTask;`
	`46`	`+ }`
	`47`	`+ catch (Exception e)`
	`48`	`+ {`
	`49`	`+ return Task.FromException(e);`
`54`	`50`	`}`
`55`	`51`	`}`
`56`	`52`
`@@ -60,24 +56,22 @@ public virtual Task CloseAsync(CancellationToken cancellationToken = default)`
`60`	`56`	`{`
`61`	`57`	`return Task.FromCanceled(cancellationToken);`
`62`	`58`	`}`
`63`		`- else`
	`59`	`+`
	`60`	`+ try`
	`61`	`+ {`
	`62`	`+ Close();`
	`63`	`+ return Task.CompletedTask;`
	`64`	`+ }`
	`65`	`+ catch (Exception e)`
`64`	`66`	`{`
`65`		`- try`
`66`		`- {`
`67`		`- Close();`
`68`		`- return Task.CompletedTask;`
`69`		`- }`
`70`		`- catch (Exception e)`
`71`		`- {`
`72`		`- return Task.FromException(e);`
`73`		`- }`
	`67`	`+ return Task.FromException(e);`
`74`	`68`	`}`
`75`	`69`	`}`
`76`	`70`
`77`	`71`	`public virtual ValueTask DisposeAsync()`
`78`	`72`	`{`
`79`	`73`	`Dispose();`
`80`		`- return new ValueTask(Task.CompletedTask);`
	`74`	`+ return default;`
`81`	`75`	`}`
`82`	`76`	`}`
`83`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,15 @@ public virtual Task CommitAsync(CancellationToken cancellationToken = default)`
`15`	`15`	`{`
`16`	`16`	`return Task.FromCanceled(cancellationToken);`
`17`	`17`	`}`
`18`		`- else`
	`18`	`+`
	`19`	`+ try`
	`20`	`+ {`
	`21`	`+ Commit();`
	`22`	`+ return Task.CompletedTask;`
	`23`	`+ }`
	`24`	`+ catch (Exception e)`
`19`	`25`	`{`
`20`		`- try`
`21`		`- {`
`22`		`- Commit();`
`23`		`- return Task.CompletedTask;`
`24`		`- }`
`25`		`- catch (Exception e)`
`26`		`- {`
`27`		`- return Task.FromException(e);`
`28`		`- }`
	`26`	`+ return Task.FromException(e);`
`29`	`27`	`}`
`30`	`28`	`}`
`31`	`29`
`@@ -35,24 +33,22 @@ public virtual Task RollbackAsync(CancellationToken cancellationToken = default)`
`35`	`33`	`{`
`36`	`34`	`return Task.FromCanceled(cancellationToken);`
`37`	`35`	`}`
`38`		`- else`
	`36`	`+`
	`37`	`+ try`
	`38`	`+ {`
	`39`	`+ Rollback();`
	`40`	`+ return Task.CompletedTask;`
	`41`	`+ }`
	`42`	`+ catch (Exception e)`
`39`	`43`	`{`
`40`		`- try`
`41`		`- {`
`42`		`- Rollback();`
`43`		`- return Task.CompletedTask;`
`44`		`- }`
`45`		`- catch (Exception e)`
`46`		`- {`
`47`		`- return Task.FromException(e);`
`48`		`- }`
	`44`	`+ return Task.FromException(e);`
`49`	`45`	`}`
`50`	`46`	`}`
`51`	`47`
`52`	`48`	`public virtual ValueTask DisposeAsync()`
`53`	`49`	`{`
`54`	`50`	`Dispose();`
`55`		`- return new ValueTask(Task.CompletedTask);`
	`51`	`+ return default;`
`56`	`52`	`}`
`57`	`53`	`}`
`58`	`54`	`}`