Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes ReportError On ConventionContext #2455

Merged
merged 4 commits into from
Oct 18, 2020
Merged

Removes ReportError On ConventionContext #2455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da96826
feat: remove report error
PascalSenn Oct 17, 2020
5a192b4
Merge branch 'develop' into pse/fix-report-error
michaelstaib Oct 18, 2020
4975dad
merge
michaelstaib Oct 18, 2020
5bf30cf
Update ThrowHelper.cs
michaelstaib Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 0 additions & 46 deletions src/HotChocolate/Data/src/Data/ErrorHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 5 additions & 6 deletions src/HotChocolate/Data/src/Data/Filters/Visitor/FilterProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 4 additions & 6 deletions src/HotChocolate/Data/src/Data/Sorting/Visitor/SortProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
42 changes: 40 additions & 2 deletions src/HotChocolate/Data/src/Data/ThrowHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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());
}
}