Skip to content

Commit 8663e30

Browse files
author
Bart Koelman
committed
Automated cleanup code
1 parent fb6801a commit 8663e30

File tree

91 files changed

+194
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+194
-115
lines changed

benchmarks/Deserialization/DeserializationBenchmarkBase.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ protected DeserializationBenchmarkBase()
3030
var resourceDefinitionAccessor = new ResourceDefinitionAccessor(resourceGraph, serviceContainer);
3131

3232
serviceContainer.AddService(typeof(IResourceDefinitionAccessor), resourceDefinitionAccessor);
33-
serviceContainer.AddService(typeof(IResourceDefinition<IncomingResource, int>), new JsonApiResourceDefinition<IncomingResource, int>(resourceGraph));
33+
34+
serviceContainer.AddService(typeof(IResourceDefinition<IncomingResource, int>),
35+
new JsonApiResourceDefinition<IncomingResource, int>(resourceGraph));
3436

3537
// ReSharper disable once VirtualMemberCallInConstructor
3638
JsonApiRequest request = CreateJsonApiRequest(resourceGraph);

src/Examples/GettingStarted/Controllers/PeopleController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace GettingStarted.Controllers
88
{
99
public sealed class PeopleController : JsonApiController<Person, int>
1010
{
11-
public PeopleController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Person, int> resourceService)
11+
public PeopleController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
12+
IResourceService<Person, int> resourceService)
1213
: base(options, resourceGraph, loggerFactory, resourceService)
1314
{
1415
}

src/Examples/JsonApiDotNetCoreExample/Controllers/OperationsController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ namespace JsonApiDotNetCoreExample.Controllers
99
{
1010
public sealed class OperationsController : JsonApiOperationsController
1111
{
12-
public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor, IJsonApiRequest request,
13-
ITargetedFields targetedFields)
12+
public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
13+
IJsonApiRequest request, ITargetedFields targetedFields)
1414
: base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
1515
{
1616
}

src/Examples/JsonApiDotNetCoreExample/Controllers/PeopleController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace JsonApiDotNetCoreExample.Controllers
88
{
99
public sealed class PeopleController : JsonApiController<Person, int>
1010
{
11-
public PeopleController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Person, int> resourceService)
11+
public PeopleController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
12+
IResourceService<Person, int> resourceService)
1213
: base(options, resourceGraph, loggerFactory, resourceService)
1314
{
1415
}

src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace JsonApiDotNetCoreExample.Controllers
88
{
99
public sealed class TodoItemsController : JsonApiController<TodoItem, int>
1010
{
11-
public TodoItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<TodoItem, int> resourceService)
11+
public TodoItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
12+
IResourceService<TodoItem, int> resourceService)
1213
: base(options, resourceGraph, loggerFactory, resourceService)
1314
{
1415
}

src/Examples/MultiDbContextExample/Controllers/ResourceAsController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace MultiDbContextExample.Controllers
88
{
99
public sealed class ResourceAsController : JsonApiController<ResourceA, int>
1010
{
11-
public ResourceAsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<ResourceA, int> resourceService)
11+
public ResourceAsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
12+
IResourceService<ResourceA, int> resourceService)
1213
: base(options, resourceGraph, loggerFactory, resourceService)
1314
{
1415
}

src/Examples/MultiDbContextExample/Controllers/ResourceBsController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace MultiDbContextExample.Controllers
88
{
99
public sealed class ResourceBsController : JsonApiController<ResourceB, int>
1010
{
11-
public ResourceBsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<ResourceB, int> resourceService)
11+
public ResourceBsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
12+
IResourceService<ResourceB, int> resourceService)
1213
: base(options, resourceGraph, loggerFactory, resourceService)
1314
{
1415
}

src/Examples/NoEntityFrameworkExample/Controllers/WorkItemsController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace NoEntityFrameworkExample.Controllers
88
{
99
public sealed class WorkItemsController : JsonApiController<WorkItem, int>
1010
{
11-
public WorkItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<WorkItem, int> resourceService)
11+
public WorkItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
12+
IResourceService<WorkItem, int> resourceService)
1213
: base(options, resourceGraph, loggerFactory, resourceService)
1314
{
1415
}

src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,31 @@ public abstract class BaseJsonApiController<TResource, TId> : CoreJsonApiControl
4141
/// <summary>
4242
/// Creates an instance from a read/write service.
4343
/// </summary>
44-
protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<TResource, TId> resourceService)
44+
protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
45+
IResourceService<TResource, TId> resourceService)
4546
: this(options, resourceGraph, loggerFactory, resourceService, resourceService)
4647
{
4748
}
4849

4950
/// <summary>
5051
/// Creates an instance from separate services for reading and writing.
5152
/// </summary>
52-
protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceQueryService<TResource, TId>? queryService = null,
53-
IResourceCommandService<TResource, TId>? commandService = null)
54-
: this(options, resourceGraph, loggerFactory, queryService, queryService, queryService, queryService, commandService, commandService, commandService,
55-
commandService, commandService, commandService)
53+
protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
54+
IResourceQueryService<TResource, TId>? queryService = null, IResourceCommandService<TResource, TId>? commandService = null)
55+
: this(options, resourceGraph, loggerFactory, queryService, queryService, queryService, queryService, commandService, commandService,
56+
commandService, commandService, commandService, commandService)
5657
{
5758
}
5859

5960
/// <summary>
6061
/// Creates an instance from separate services for the various individual read and write methods.
6162
/// </summary>
62-
protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IGetAllService<TResource, TId>? getAll = null,
63-
IGetByIdService<TResource, TId>? getById = null, IGetSecondaryService<TResource, TId>? getSecondary = null,
64-
IGetRelationshipService<TResource, TId>? getRelationship = null, ICreateService<TResource, TId>? create = null,
65-
IAddToRelationshipService<TResource, TId>? addToRelationship = null, IUpdateService<TResource, TId>? update = null,
66-
ISetRelationshipService<TResource, TId>? setRelationship = null, IDeleteService<TResource, TId>? delete = null,
67-
IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
63+
protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
64+
IGetAllService<TResource, TId>? getAll = null, IGetByIdService<TResource, TId>? getById = null,
65+
IGetSecondaryService<TResource, TId>? getSecondary = null, IGetRelationshipService<TResource, TId>? getRelationship = null,
66+
ICreateService<TResource, TId>? create = null, IAddToRelationshipService<TResource, TId>? addToRelationship = null,
67+
IUpdateService<TResource, TId>? update = null, ISetRelationshipService<TResource, TId>? setRelationship = null,
68+
IDeleteService<TResource, TId>? delete = null, IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
6869
{
6970
ArgumentGuard.NotNull(options, nameof(options));
7071
ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));

src/JsonApiDotNetCore/Controllers/JsonApiCommandController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public abstract class JsonApiCommandController<TResource, TId> : BaseJsonApiCont
2626
/// <summary>
2727
/// Creates an instance from a write-only service.
2828
/// </summary>
29-
protected JsonApiCommandController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceCommandService<TResource, TId> commandService)
29+
protected JsonApiCommandController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
30+
IResourceCommandService<TResource, TId> commandService)
3031
: base(options, resourceGraph, loggerFactory, null, commandService)
3132
{
3233
}

0 commit comments

Comments
 (0)