Consolidate into one ProcessException() method

Author: MarkusG

EntityFramework.Exceptions.Common/ExceptionFactory.cs

@@ -1,5 +1,4 @@
-using Microsoft.EntityFrameworkCore;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data.Common;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
@@ -10,24 +9,19 @@ static class ExceptionFactory
 {
     internal static Exception Create<T>(ExceptionProcessorInterceptor<T>.DatabaseError error, Exception exception, IReadOnlyList<EntityEntry> entries) where T : DbException
     {
-        return error switch
+        if (entries?.Count > 0)
         {
-            ExceptionProcessorInterceptor<T>.DatabaseError.CannotInsertNull when entries.Count > 0 => new CannotInsertNullException("Cannot insert null", exception.InnerException, entries),
-            ExceptionProcessorInterceptor<T>.DatabaseError.CannotInsertNull when entries.Count == 0 => new CannotInsertNullException("Cannot insert null", exception.InnerException),
-            ExceptionProcessorInterceptor<T>.DatabaseError.MaxLength when entries.Count > 0 => new MaxLengthExceededException("Maximum length exceeded", exception.InnerException, entries),
-            ExceptionProcessorInterceptor<T>.DatabaseError.MaxLength when entries.Count == 0 => new MaxLengthExceededException("Maximum length exceeded", exception.InnerException),
-            ExceptionProcessorInterceptor<T>.DatabaseError.NumericOverflow when entries.Count > 0 => new NumericOverflowException("Numeric overflow", exception.InnerException, entries),
-            ExceptionProcessorInterceptor<T>.DatabaseError.NumericOverflow when entries.Count == 0 => new NumericOverflowException("Numeric overflow", exception.InnerException),
-            ExceptionProcessorInterceptor<T>.DatabaseError.ReferenceConstraint when entries.Count > 0 => new ReferenceConstraintException("Reference constraint violation", exception.InnerException, entries),
-            ExceptionProcessorInterceptor<T>.DatabaseError.ReferenceConstraint when entries.Count == 0 => new ReferenceConstraintException("Reference constraint violation", exception.InnerException),
-            ExceptionProcessorInterceptor<T>.DatabaseError.UniqueConstraint when entries.Count > 0 => new UniqueConstraintException("Unique constraint violation", exception.InnerException, entries),
-            ExceptionProcessorInterceptor<T>.DatabaseError.UniqueConstraint when entries.Count == 0 => new UniqueConstraintException("Unique constraint violation", exception.InnerException),
-            _ => null,
-        };
-    }
-    
-    internal static Exception Create<T>(ExceptionProcessorInterceptor<T>.DatabaseError error, Exception exception) where T : DbException
-    {
+            return error switch
+            {
+                ExceptionProcessorInterceptor<T>.DatabaseError.CannotInsertNull => new CannotInsertNullException( "Cannot insert null", exception.InnerException, entries),
+                ExceptionProcessorInterceptor<T>.DatabaseError.MaxLength => new MaxLengthExceededException( "Maximum length exceeded", exception.InnerException, entries),
+                ExceptionProcessorInterceptor<T>.DatabaseError.NumericOverflow => new NumericOverflowException( "Numeric overflow", exception.InnerException, entries),
+                ExceptionProcessorInterceptor<T>.DatabaseError.ReferenceConstraint => new ReferenceConstraintException( "Reference constraint violation", exception.InnerException, entries),
+                ExceptionProcessorInterceptor<T>.DatabaseError.UniqueConstraint => new UniqueConstraintException( "Unique constraint violation", exception.InnerException, entries),
+                _ => null,
+            };
+        }
+
         return error switch
         {
             ExceptionProcessorInterceptor<T>.DatabaseError.CannotInsertNull => new CannotInsertNullException("Cannot insert null", exception.InnerException),

EntityFramework.Exceptions.Common/ExceptionProcessorInterceptor.cs

@@ -28,75 +28,52 @@ protected internal enum DatabaseError
     /// <inheritdoc />
     public void SaveChangesFailed(DbContextErrorEventData eventData)
     {
-        ProcessDbUpdateException(eventData, eventData.Exception as DbUpdateException);
+        ProcessException(eventData.Exception, eventData.Context);
     }
 
     /// <inheritdoc />
     public Task SaveChangesFailedAsync(DbContextErrorEventData eventData,
         CancellationToken cancellationToken = new CancellationToken())
     {
-        ProcessDbUpdateException(eventData, eventData.Exception as DbUpdateException);
+        ProcessException(eventData.Exception, eventData.Context);
         return Task.CompletedTask;
     }
 
     /// <inheritdoc />
     public void CommandFailed(DbCommand command, CommandErrorEventData eventData)
     {
-        ProcessDbException(eventData, eventData.Exception as DbException);
+        ProcessException(eventData.Exception, eventData.Context);
     }
 
     /// <inheritdoc />
     public Task CommandFailedAsync(DbCommand command, CommandErrorEventData eventData,
         CancellationToken cancellationToken = new CancellationToken())
     {
-        ProcessDbException(eventData, eventData.Exception as DbException);
+        ProcessException(eventData.Exception, eventData.Context);
         return Task.CompletedTask;
     }
 
     protected abstract DatabaseError? GetDatabaseError(TProviderException dbException);
 
     [StackTraceHidden]
-    private void ProcessDbUpdateException(DbContextErrorEventData eventData, DbUpdateException dbUpdateException)
+    private void ProcessException(Exception eventException, DbContext eventContext)
     {
-        if (dbUpdateException == null || eventData.Exception.GetBaseException() is not TProviderException providerException) return;
+        if (eventException?.GetBaseException() is not TProviderException providerException) return;
 
         var error = GetDatabaseError(providerException);
 
         if (error == null) return;
 
-        var exception = ExceptionFactory.Create(error.Value, dbUpdateException, dbUpdateException.Entries);
+        var updateException = eventException as DbUpdateException;
+        var exception = ExceptionFactory.Create(error.Value, eventException, updateException?.Entries);
 
         switch (exception)
         {
-            case UniqueConstraintException uniqueConstraint when eventData.Context != null:
-                SetConstraintDetails(eventData.Context, uniqueConstraint, providerException);
+            case UniqueConstraintException uniqueConstraint when eventContext != null:
+                SetConstraintDetails(eventContext, uniqueConstraint, providerException);
                 break;
-            case ReferenceConstraintException referenceConstraint when eventData.Context != null:
-                SetConstraintDetails(eventData.Context, referenceConstraint, providerException);
-                break;
-        }
-
-        throw exception;
-    }
-
-    [StackTraceHidden]
-    private void ProcessDbException(CommandErrorEventData eventData, DbException dbException)
-    {
-        if (dbException == null || eventData.Exception.GetBaseException() is not TProviderException providerException) return;
-
-        var error = GetDatabaseError(providerException);
-
-        if (error == null) return;
-
-        var exception = ExceptionFactory.Create(error.Value, dbException);
-
-        switch (exception)
-        {
-            case UniqueConstraintException uniqueConstraint when eventData.Context != null:
-                SetConstraintDetails(eventData.Context, uniqueConstraint, providerException);
-                break;
-            case ReferenceConstraintException referenceConstraint when eventData.Context != null:
-                SetConstraintDetails(eventData.Context, referenceConstraint, providerException);
+            case ReferenceConstraintException referenceConstraint when eventContext != null:
+                SetConstraintDetails(eventContext, referenceConstraint, providerException);
                 break;
         }