Removes ReportError On ConventionContext (#2455)

Co-authored-by: Michael Staib <michael@chillicream.com>
ChilliCream · Oct 18, 2020 · b8b4b0b · b8b4b0b
1 parent a9e91a9
commit b8b4b0b
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 60 deletions.
diff --git a/src/HotChocolate/Data/src/Data/ErrorHelper.cs b/src/HotChocolate/Data/src/Data/ErrorHelper.cs
@@ -29,52 +29,6 @@ internal static class ErrorHelper
                 .Build();
         }
 
-        public static ISchemaError FilterField_RuntimeType_Unknown(FilterField field) =>
-            SchemaErrorBuilder.New()
-                .SetMessage(
-                    DataResources.FilterField_FilterField_TypeUnknown,
-                    field.DeclaringType.Name,
-                    field.Name)
-                .SetTypeSystemObject(field.DeclaringType)
-                .SetExtension(nameof(field), field)
-                .Build();
-
-        public static ISchemaError FilterProvider_UnableToCreateFieldHandler(
-            IFilterProvider filterProvider,
-            Type fieldHandler) =>
-            SchemaErrorBuilder.New()
-                .SetMessage(
-                    DataResources.FilterProvider_UnableToCreateFieldHandler,
-                    fieldHandler.FullName ?? fieldHandler.Name,
-                    filterProvider.GetType().FullName ?? filterProvider.GetType().Name)
-                .SetExtension(nameof(filterProvider), filterProvider)
-                .SetExtension(nameof(fieldHandler), fieldHandler)
-                .Build();
-
-        public static ISchemaError SortProvider_UnableToCreateFieldHandler(
-            ISortProvider sortProvider,
-            Type fieldHandler) =>
-            SchemaErrorBuilder.New()
-                .SetMessage(
-                    DataResources.SortProvider_UnableToCreateFieldHandler,
-                    fieldHandler.FullName ?? fieldHandler.Name,
-                    sortProvider.GetType().FullName ?? sortProvider.GetType().Name)
-                .SetExtension(nameof(sortProvider), sortProvider)
-                .SetExtension(nameof(fieldHandler), fieldHandler)
-                .Build();
-
-        public static ISchemaError SortProvider_UnableToCreateOperationHandler(
-            ISortProvider sortProvider,
-            Type operationHandler) =>
-            SchemaErrorBuilder.New()
-                .SetMessage(
-                    DataResources.SortProvider_UnableToCreateOperationHandler,
-                    operationHandler.FullName ?? operationHandler.Name,
-                    sortProvider.GetType().FullName ?? sortProvider.GetType().Name)
-                .SetExtension(nameof(sortProvider), sortProvider)
-                .SetExtension(nameof(operationHandler), operationHandler)
-                .Build();
-
         public static IError SortingVisitor_ListValues(ISortField field, ListValueNode node) =>
             ErrorBuilder.New()
                 .SetMessage(

diff --git a/src/HotChocolate/Data/src/Data/Filters/Visitor/FilterProvider.cs b/src/HotChocolate/Data/src/Data/Filters/Visitor/FilterProvider.cs
@@ -11,9 +11,9 @@
 namespace HotChocolate.Data.Filters
 {
     public abstract class FilterProvider<TContext>
-        : Convention<FilterProviderDefinition>
-        , IFilterProvider
-        , IFilterProviderConvention
+        : Convention<FilterProviderDefinition>,
+          IFilterProvider,
+          IFilterProviderConvention
         where TContext : IFilterVisitorContext
     {
         private readonly List<IFilterFieldHandler<TContext>> _fieldHandlers =
@@ -86,9 +86,8 @@ protected override void OnComplete(IConventionContext context)
                         break;
 
                     case null:
-                        throw new SchemaException(
-                            FilterProvider_UnableToCreateFieldHandler(this, handler.Type));
-
+                        throw FilterProvider_UnableToCreateFieldHandler(this, handler.Type);
+
                     case IFilterFieldHandler<TContext> casted:
                         _fieldHandlers.Add(casted);
                         break;

diff --git a/src/HotChocolate/Data/src/Data/Sorting/Visitor/SortProvider.cs b/src/HotChocolate/Data/src/Data/Sorting/Visitor/SortProvider.cs
@@ -101,9 +101,8 @@ protected override void OnComplete(IConventionContext context)
                         break;
 
                     case null:
-                        throw new SchemaException(
-                            SortProvider_UnableToCreateFieldHandler(this, handler.Type));
-
+                        throw SortProvider_UnableToCreateFieldHandler(this, handler.Type);
+
                     case ISortFieldHandler<TContext> casted:
                         _fieldHandlers.Add(casted);
                         break;
@@ -122,9 +121,8 @@ protected override void OnComplete(IConventionContext context)
                         break;
 
                     case null:
-                        throw new SchemaException(
-                            SortProvider_UnableToCreateOperationHandler(this, handler.Type));
-
+                        throw SortProvider_UnableToCreateOperationHandler(this, handler.Type);
+
                     case ISortOperationHandler<TContext> casted:
                         _operationHandlers.Add(casted);
                         break;

diff --git a/src/HotChocolate/Data/src/Data/ThrowHelper.cs b/src/HotChocolate/Data/src/Data/ThrowHelper.cs
@@ -86,6 +86,45 @@ internal static class ThrowHelper
                     .SetExtension(nameof(scope), scope)
                     .Build());
 
+        public static SchemaException FilterProvider_UnableToCreateFieldHandler(
+            IFilterProvider filterProvider,
+            Type fieldHandler) =>
+            new SchemaException(
+                SchemaErrorBuilder.New()
+                    .SetMessage(
+                        DataResources.FilterProvider_UnableToCreateFieldHandler,
+                        fieldHandler.FullName ?? fieldHandler.Name,
+                        filterProvider.GetType().FullName ?? filterProvider.GetType().Name)
+                    .SetExtension(nameof(filterProvider), filterProvider)
+                    .SetExtension(nameof(fieldHandler), fieldHandler)
+                    .Build());
+
+        public static SchemaException SortProvider_UnableToCreateFieldHandler(
+            ISortProvider sortProvider,
+            Type fieldHandler) =>
+            new SchemaException(
+                SchemaErrorBuilder.New()
+                    .SetMessage(
+                        DataResources.SortProvider_UnableToCreateFieldHandler,
+                        fieldHandler.FullName ?? fieldHandler.Name,
+                        sortProvider.GetType().FullName ?? sortProvider.GetType().Name)
+                    .SetExtension(nameof(sortProvider), sortProvider)
+                    .SetExtension(nameof(fieldHandler), fieldHandler)
+                    .Build());
+
+        public static SchemaException SortProvider_UnableToCreateOperationHandler(
+            ISortProvider sortProvider,
+            Type operationHandler) =>
+            new SchemaException(
+                SchemaErrorBuilder.New()
+                    .SetMessage(
+                        DataResources.SortProvider_UnableToCreateOperationHandler,
+                        operationHandler.FullName ?? operationHandler.Name,
+                        sortProvider.GetType().FullName ?? sortProvider.GetType().Name)
+                    .SetExtension(nameof(sortProvider), sortProvider)
+                    .SetExtension(nameof(operationHandler), operationHandler)
+                    .Build());
+
         public static SchemaException SortProvider_NoFieldHandlersConfigured(
             ISortProvider filterProvider) =>
             new SchemaException(
@@ -214,8 +253,7 @@ internal static class ThrowHelper
         public static SchemaException ProjectionConvention_CouldNotProject() =>
             new SchemaException(
                 SchemaErrorBuilder.New()
-                    .SetMessage(
-                        DataResources.ProjectionConvention_CouldNotProject)
+                    .SetMessage(DataResources.ProjectionConvention_CouldNotProject)
                     .Build());
     }
 }