Merge pull request #46 from matteobortolazzo/dev

Release 1.1.3
matteobortolazzo · Jun 14, 2019 · 866e4da · 866e4da
2 parents 3d68c0f + a6f2f63
commit 866e4da
Show file tree

Hide file tree

Showing 9 changed files with 163 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
-# 1.1.2 (2019-06-08)
+# 1.1.3 (2019-06-14)
+
+## Bug Fixes
+* **Exception:** Fixing null reference exception and poor exception handling. ([#PR45](https://github.com/matteobortolazzo/couchdb-net/pull/45))
+
+# 1.1.2 (2019-06-08)
 
 ## Bug Fixes
 * **Client:** Prevent deadlocks when run against .NET Framework. ([#PR43](https://github.com/matteobortolazzo/couchdb-net/pull/43))

diff --git a/LATEST_CHANGE.md b/LATEST_CHANGE.md
@@ -1,2 +1,2 @@
 ## Bug Fixes
-* **Client:** Prevent deadlocks when run against .NET Framework. ([#PR43](https://github.com/matteobortolazzo/couchdb-net/pull/43))
+* **Exception:** Fixing null reference exception and poor exception handling. ([#PR45](https://github.com/matteobortolazzo/couchdb-net/pull/45))
diff --git a/src/CouchDB.Driver/CouchQueryProvider.cs b/src/CouchDB.Driver/CouchQueryProvider.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Runtime.ExceptionServices;
 
 namespace CouchDB.Driver
 {
@@ -37,14 +38,22 @@ public override object Execute(Expression expression, bool completeResponse)
             // Remove from the expressions tree all IQueryable methods not supported by CouchDB and put them into the list
             var unsupportedMethodCallExpressions = new List<MethodCallExpression>();
             expression = RemoveUnsupportedMethodExpressions(expression, out var hasUnsupportedMethods, unsupportedMethodCallExpressions);
-            
+
             var body = Translate(ref expression);
             Type elementType = TypeSystem.GetElementType(expression.Type);
 
             // Create generic GetCouchList method and invoke it, sending the request to CouchDB
             MethodInfo method = typeof(CouchQueryProvider).GetMethod(nameof(CouchQueryProvider.GetCouchList));
             MethodInfo generic = method.MakeGenericMethod(elementType);
-            var result = generic.Invoke(this, new[] { body });
+            object result = null;
+            try
+            {
+                result = generic.Invoke(this, new[] { body });
+            }
+            catch (TargetInvocationException ex)
+            {
+                ExceptionDispatchInfo.Capture(ex.InnerException).Throw();
+            }
 
             // If no unsupported methods, return the result
             if (!hasUnsupportedMethods)
@@ -73,7 +82,7 @@ private string Translate(ref Expression e)
         }
 
         public object GetCouchList<T>(string body)
-        {            
+        {
             FindResult<T> result = _flurlClient
                 .Request(_connectionString)
                 .AppendPathSegments(_db, "_find")
@@ -82,7 +91,7 @@ public object GetCouchList<T>(string body)
                 .SendRequest();
 
             var couchList = new CouchList<T>(result.Docs.ToList(), result.Bookmark, result.ExecutionStats);
-            return couchList;            
+            return couchList;
         }
 
         private Expression RemoveUnsupportedMethodExpressions(Expression expression, out bool hasUnsupportedMethods, IList<MethodCallExpression> unsupportedMethodCallExpressions)
@@ -177,7 +186,7 @@ MethodInfo FindEnumerableMethod()
                 throw;
             }
         }
-        
+
         private object GetArgumentValueFromExpression(Expression e)
         {
             if (e is ConstantExpression c)
@@ -190,7 +199,7 @@ private object GetArgumentValueFromExpression(Expression e)
             }
             throw new NotImplementedException($"Expression of type {e.NodeType} not supported.");
         }
-        
+
         private static MethodInfo FindEnumerableMinMax(MethodInfo queryableMethodInfo)
         {
             Type[] genericParams = queryableMethodInfo.GetGenericArguments();
@@ -203,6 +212,6 @@ private static MethodInfo FindEnumerableMinMax(MethodInfo queryableMethodInfo)
                     enumerableMethodInfo.ReturnType == genericParams[1];
             });
             return finalMethodInfo;
-        }           
+        }
     }
 }
diff --git a/src/CouchDB.Driver/Exceptions/CouchConflictException.cs b/src/CouchDB.Driver/Exceptions/CouchConflictException.cs
@@ -1,16 +1,14 @@
-namespace CouchDB.Driver.Exceptions
+using CouchDB.Driver.DTOs;
+using System;
+
+namespace CouchDB.Driver.Exceptions
 {
     /// <summary>
     /// The exception that is thrown when there is a conflict.
     /// </summary>
     public class CouchConflictException : CouchException
     {
-        /// <summary>
-        /// Creates a new instance of CouchConflictException.
-        /// </summary>
-        /// <param name="message">Error message</param>
-        /// <param name="reason">Error reason</param>
-        public CouchConflictException(string message, string reason) : base(message, reason) { }
+        internal CouchConflictException(CouchError couchError, Exception innerException) : base(couchError, innerException) { }
 
         public CouchConflictException()
         {
@@ -20,7 +18,7 @@ public CouchConflictException(string message) : base(message)
         {
         }
 
-        public CouchConflictException(string message, System.Exception innerException) : base(message, innerException)
+        public CouchConflictException(string message, Exception innerException) : base(message, innerException)
         {
         }
     }

diff --git a/src/CouchDB.Driver/Exceptions/CouchException.cs b/src/CouchDB.Driver/Exceptions/CouchException.cs
@@ -1,4 +1,5 @@
-using System;
+using CouchDB.Driver.DTOs;
+using System;
 
 namespace CouchDB.Driver.Exceptions
 {
@@ -12,18 +13,31 @@ public class CouchException : Exception
         /// </summary>
         /// <param name="message">Error message</param>
         /// <param name="reason">Error reason</param>
-        public CouchException(string message, string reason) : base(message, new Exception(reason)) { }
+        public CouchException(string message, string reason) : this(message, reason, null)
+        {
+        }
+
+        public CouchException() : this(null, null, null)
+        {
+        }
 
-        public CouchException()
+        public CouchException(string message) : this(message, null, null)
         {
         }
 
-        public CouchException(string message) : base(message)
+        public CouchException(string message, Exception innerException) : this(message, null, innerException)
         {
         }
 
-        public CouchException(string message, Exception innerException) : base(message, innerException)
+        internal CouchException(CouchError couchError, Exception innerException) : this(couchError?.Error, couchError?.Reason, innerException)
         {
         }
+
+        public CouchException(string message, string reason, Exception innerException) : base(message, innerException)
+        {
+            Reason = reason;
+        }
+
+        public string Reason { get; }
     }
 }
diff --git a/src/CouchDB.Driver/Exceptions/CouchNoIndexException.cs b/src/CouchDB.Driver/Exceptions/CouchNoIndexException.cs
@@ -1,16 +1,14 @@
-namespace CouchDB.Driver.Exceptions
+using CouchDB.Driver.DTOs;
+using System;
+
+namespace CouchDB.Driver.Exceptions
 {
     /// <summary>
     /// The exception that is thrown when there is no index for the query.
     /// </summary>
     public class CouchNoIndexException : CouchException
     {
-        /// <summary>
-        /// Creates a new instance of CouchNoIndexException.
-        /// </summary>
-        /// <param name="message">Error message</param>
-        /// <param name="reason">Error reason</param>
-        public CouchNoIndexException(string message, string reason) : base(message, reason) { }
+        internal CouchNoIndexException(CouchError couchError, Exception innerException) : base(couchError, innerException) { }
 
         public CouchNoIndexException()
         {
@@ -20,7 +18,7 @@ public CouchNoIndexException(string message) : base(message)
         {
         }
 
-        public CouchNoIndexException(string message, System.Exception innerException) : base(message, innerException)
+        public CouchNoIndexException(string message, Exception innerException) : base(message, innerException)
         {
         }
     }

diff --git a/src/CouchDB.Driver/Exceptions/CouchNotFoundException.cs b/src/CouchDB.Driver/Exceptions/CouchNotFoundException.cs
@@ -1,16 +1,14 @@
-namespace CouchDB.Driver.Exceptions
+using CouchDB.Driver.DTOs;
+using System;
+
+namespace CouchDB.Driver.Exceptions
 {
     /// <summary>
     /// The exception that is thrown when something is not found.
     /// </summary>
     public class CouchNotFoundException : CouchException
     {
-        /// <summary>
-        /// Creates a new instance of CouchNotFoundException.
-        /// </summary>
-        /// <param name="message">Error message</param>
-        /// <param name="reason">Error reason</param>
-        public CouchNotFoundException(string message, string reason) : base(message, reason) { }
+        internal CouchNotFoundException(CouchError couchError, Exception innerException) : base(couchError, innerException) { }
 
         public CouchNotFoundException()
         {
@@ -20,7 +18,7 @@ public CouchNotFoundException(string message) : base(message)
         {
         }
 
-        public CouchNotFoundException(string message, System.Exception innerException) : base(message, innerException)
+        public CouchNotFoundException(string message, Exception innerException) : base(message, innerException)
         {
         }
     }

diff --git a/src/CouchDB.Driver/Helpers/RequestsHelper.cs b/src/CouchDB.Driver/Helpers/RequestsHelper.cs
@@ -23,41 +23,25 @@ public static async Task<T> SendRequestAsync<T>(this Task<T> asyncRequest)
             }
             catch (FlurlHttpException ex)
             {
-                CouchError couchError;
-                try
-                {
-                    couchError = await ex.GetResponseJsonAsync<CouchError>().ConfigureAwait(false);
-                }
-                catch
+                CouchError couchError = await ex.GetResponseJsonAsync<CouchError>().ConfigureAwait(false);
+
+                if (couchError == null)
                 {
-                    throw;
+                    couchError = new CouchError();
                 }
 
-                if (couchError != null)
+                switch (ex.Call.HttpStatus)
                 {
-                    switch (ex.Call.HttpStatus)
-                    {
-                        case HttpStatusCode.Conflict:
-                            throw couchError.NewCouchExteption(typeof(CouchConflictException));
-                        case HttpStatusCode.NotFound:
-                            throw couchError.NewCouchExteption(typeof(CouchNotFoundException));
-                        case HttpStatusCode.BadRequest:
-                            if (couchError.Error == "no_usable_index")
-                            {
-                                throw couchError.NewCouchExteption(typeof(CouchNoIndexException));
-                            }
-                            break;
-                    }
+                    case HttpStatusCode.Conflict:
+                        throw new CouchConflictException(couchError, ex);
+                    case HttpStatusCode.NotFound:
+                        throw new CouchNotFoundException(couchError, ex);
+                    case HttpStatusCode.BadRequest when couchError.Error == "no_usable_index":
+                        throw new CouchNoIndexException(couchError, ex);
+                    default:
+                        throw new CouchException(couchError, ex);
                 }
-                throw new CouchException(couchError.Error, couchError.Reason);                
             }
         }
-
-        private static Exception NewCouchExteption(this CouchError e, Type type)
-        {
-            ConstructorInfo ctor = type.GetConstructor(new[] { typeof(string), typeof(string) });
-            var exception = (CouchException)ctor.Invoke(new string[] { e.Error, e.Reason });
-            return exception;
-        }
     }
 }