Also allow DefaultHandler(false) to skip a handler when multiple hand…

…lers for a type is found
serenity-is · Jan 3, 2025 · bf3ea8c · bf3ea8c
1 parent e250695
commit bf3ea8c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/Serenity.Net.Services/RequestHandlers/Handler/DefaultHandlerFactory.cs b/src/Serenity.Net.Services/RequestHandlers/Handler/DefaultHandlerFactory.cs
@@ -1,4 +1,4 @@
-namespace Serenity.Services;
+namespace Serenity.Services;
 
 /// <summary>
 /// Default implementation for the <see cref="IDefaultHandlerFactory"/>
@@ -36,6 +36,13 @@ private Type GetHandlerType((Type rowType, Type handlerInterface) args)
         if (defaults.Count() == 1)
             return defaults.First();
 
+        if (!defaults.Any())
+        {
+            defaults = handlers.Where(x => x.GetAttribute<DefaultHandlerAttribute>()?.Value != false);
+            if (defaults.Count() == 1)
+                return defaults.First();
+        }
+
         throw new InvalidProgramException($"There are multiple {args.handlerInterface.FullName} types " +
             $"for row type {args.rowType.FullName}. Please add [DefaultHandler] to one of them.");
     }

diff --git a/src/Serenity.Net.Services/RequestHandlers/Helpers/ServiceCollectionExtensions.cs b/src/Serenity.Net.Services/RequestHandlers/Helpers/ServiceCollectionExtensions.cs
@@ -148,11 +148,17 @@ public static IServiceCollection AddCustomRequestHandlers(this IServiceCollectio
                 if (defaults.Length != 1)
                 {
                     if (defaults.Length == 0)
-                        throw new InvalidProgramException($"There are multiple {pair.Key} request handler types ({string.Join(", ", pair.Value)}). " +
-                            "Please add [DefaultHandler] to one of them!");
+                        defaults = pair.Value.Where(x => x.GetAttribute<DefaultHandlerAttribute>()?.Value != false).ToArray();
 
-                    throw new InvalidProgramException($"There are multiple {pair.Key} request handler types with [DefaultHandler] attribute ({string.Join(", ", (IEnumerable<Type>)defaults)}). " +
-                        "Please use [DefaultHandler] on only one of them!");
+                    if (defaults.Length != 1)
+                    {
+                        if (defaults.Length == 0)
+                            throw new InvalidProgramException($"There are multiple {pair.Key} request handler types ({string.Join(", ", pair.Value)}). " +
+                                "Please add [DefaultHandler] to one of them!");
+
+                        throw new InvalidProgramException($"There are multiple {pair.Key} request handler types with [DefaultHandler] attribute ({string.Join(", ", (IEnumerable<Type>)defaults)}). " +
+                            "Please use [DefaultHandler] on only one of them!");
+                    }
                 }
 
                 collection.AddTransient(pair.Key, defaults[0]);