Skip to content

Commit 7fbd4dd

Browse files
author
Bart Koelman
committed
Automated cleanup code
1 parent fb6801a commit 7fbd4dd

File tree

92 files changed

+195
-116
lines changed

Some content is hidden

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

92 files changed

+195
-116
lines changed

‎benchmarks/Deserialization/DeserializationBenchmarkBase.cs

+3-1
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

+2-1
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

+2-2
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

+2-1
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

+2-1
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

+2-1
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

+2-1
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

+2-1
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

+12-11
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

+2-1
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
}

‎src/JsonApiDotNetCore/Controllers/JsonApiController.cs

+10-9
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,21 @@ public abstract class JsonApiController<TResource, TId> : BaseJsonApiController<
2323
where TResource : class, IIdentifiable<TId>
2424
{
2525
/// <inheritdoc />
26-
protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<TResource, TId> resourceService)
26+
protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
27+
IResourceService<TResource, TId> resourceService)
2728
: base(options, resourceGraph, loggerFactory, resourceService)
2829
{
2930
}
3031

3132
/// <inheritdoc />
32-
protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IGetAllService<TResource, TId>? getAll = null,
33-
IGetByIdService<TResource, TId>? getById = null, IGetSecondaryService<TResource, TId>? getSecondary = null,
34-
IGetRelationshipService<TResource, TId>? getRelationship = null, ICreateService<TResource, TId>? create = null,
35-
IAddToRelationshipService<TResource, TId>? addToRelationship = null, IUpdateService<TResource, TId>? update = null,
36-
ISetRelationshipService<TResource, TId>? setRelationship = null, IDeleteService<TResource, TId>? delete = null,
37-
IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
38-
: base(options, resourceGraph, loggerFactory, getAll, getById, getSecondary, getRelationship, create, addToRelationship, update, setRelationship, delete,
39-
removeFromRelationship)
33+
protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
34+
IGetAllService<TResource, TId>? getAll = null, IGetByIdService<TResource, TId>? getById = null,
35+
IGetSecondaryService<TResource, TId>? getSecondary = null, IGetRelationshipService<TResource, TId>? getRelationship = null,
36+
ICreateService<TResource, TId>? create = null, IAddToRelationshipService<TResource, TId>? addToRelationship = null,
37+
IUpdateService<TResource, TId>? update = null, ISetRelationshipService<TResource, TId>? setRelationship = null,
38+
IDeleteService<TResource, TId>? delete = null, IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
39+
: base(options, resourceGraph, loggerFactory, getAll, getById, getSecondary, getRelationship, create, addToRelationship, update, setRelationship,
40+
delete, removeFromRelationship)
4041
{
4142
}
4243

‎src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ namespace JsonApiDotNetCore.Controllers
1616
/// </summary>
1717
public abstract class JsonApiOperationsController : BaseJsonApiOperationsController
1818
{
19-
protected JsonApiOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor, IJsonApiRequest request,
20-
ITargetedFields targetedFields)
19+
protected JsonApiOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
20+
IOperationsProcessor processor, IJsonApiRequest request, ITargetedFields targetedFields)
2121
: base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
2222
{
2323
}

‎src/JsonApiDotNetCore/Controllers/JsonApiQueryController.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public abstract class JsonApiQueryController<TResource, TId> : BaseJsonApiContro
2525
/// <summary>
2626
/// Creates an instance from a read-only service.
2727
/// </summary>
28-
protected JsonApiQueryController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceQueryService<TResource, TId> queryService)
28+
protected JsonApiQueryController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
29+
IResourceQueryService<TResource, TId> queryService)
2930
: base(options, resourceGraph, loggerFactory, queryService)
3031
{
3132
}

‎src/JsonApiDotNetCore/Middleware/JsonApiRoutingConvention.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ public JsonApiRoutingConvention(IJsonApiOptions options, IResourceGraph resource
4949
/// <inheritdoc />
5050
public ResourceType? GetResourceTypeForController(Type? controllerType)
5151
{
52-
return controllerType != null && _resourceTypePerControllerTypeMap.TryGetValue(controllerType, out ResourceType? resourceType) ? resourceType : null;
52+
return controllerType != null && _resourceTypePerControllerTypeMap.TryGetValue(controllerType, out ResourceType? resourceType)
53+
? resourceType
54+
: null;
5355
}
5456

5557
/// <inheritdoc />

‎src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public override Expression VisitAny(AnyExpression expression, Type? argument)
116116
{
117117
Expression property = Visit(expression.TargetAttribute, argument);
118118

119-
IList valueList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(property.Type))!;
119+
var valueList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(property.Type))!;
120120

121121
foreach (LiteralConstantExpression constant in expression.Constants)
122122
{

‎src/JsonApiDotNetCore/Resources/Annotations/AttrAttribute.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Reflection;
32
using JetBrains.Annotations;
43

54
namespace JsonApiDotNetCore.Resources.Annotations

‎src/JsonApiDotNetCore/Serialization/Request/JsonApiReader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private Document DeserializeDocument(string requestBody)
8181
using IDisposable _ =
8282
CodeTimingSessionManager.Current.Measure("JsonSerializer.Deserialize", MeasurementSettings.ExcludeJsonSerializationInPercentages);
8383

84-
Document? document = JsonSerializer.Deserialize<Document>(requestBody, _options.SerializerReadOptions);
84+
var document = JsonSerializer.Deserialize<Document>(requestBody, _options.SerializerReadOptions);
8585

8686
if (document == null)
8787
{

‎src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ private string GetLinkForPagination(int pageOffset, string? pageSizeValue)
203203

204204
private string GetQueryStringInPaginationLink(int pageOffset, string? pageSizeValue)
205205
{
206-
IDictionary<string, string?> parameters = HttpContext.Request.Query.ToDictionary(pair => pair.Key, pair => (string?)pair.Value.ToString());
206+
IDictionary<string, string?> parameters = HttpContext.Request.Query.ToDictionary(pair => pair.Key, pair => pair.Value.ToString());
207207

208208
if (pageSizeValue == null)
209209
{

‎src/JsonApiDotNetCore/Services/JsonApiResourceService.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,8 @@ private void AssertRelationshipInJsonApiRequestIsNotNull([SysNotNull] Relationsh
524524
{
525525
if (relationship == null)
526526
{
527-
throw new InvalidOperationException(
528-
$"Expected {nameof(IJsonApiRequest)}.{nameof(IJsonApiRequest.Relationship)} not to be null at this point.");
527+
throw new InvalidOperationException($"Expected {nameof(IJsonApiRequest)}.{nameof(IJsonApiRequest.Relationship)} not to be null at this point.");
529528
}
530529
}
531-
532530
}
533531
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
99
{
1010
public sealed class BroadcastCommentsController : JsonApiController<BroadcastComment, int>
1111
{
12-
public BroadcastCommentsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<BroadcastComment, int> resourceService)
12+
public BroadcastCommentsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
13+
IResourceService<BroadcastComment, int> resourceService)
1314
: base(options, resourceGraph, loggerFactory, resourceService)
1415
{
1516
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
99
{
1010
public sealed class TelevisionBroadcastsController : JsonApiController<TelevisionBroadcast, int>
1111
{
12-
public TelevisionBroadcastsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<TelevisionBroadcast, int> resourceService)
12+
public TelevisionBroadcastsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
13+
IResourceService<TelevisionBroadcast, int> resourceService)
1314
: base(options, resourceGraph, loggerFactory, resourceService)
1415
{
1516
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
99
{
1010
public sealed class TelevisionNetworksController : JsonApiController<TelevisionNetwork, int>
1111
{
12-
public TelevisionNetworksController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<TelevisionNetwork, int> resourceService)
12+
public TelevisionNetworksController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
13+
IResourceService<TelevisionNetwork, int> resourceService)
1314
: base(options, resourceGraph, loggerFactory, resourceService)
1415
{
1516
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
99
{
1010
public sealed class TelevisionStationsController : JsonApiController<TelevisionStation, int>
1111
{
12-
public TelevisionStationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<TelevisionStation, int> resourceService)
12+
public TelevisionStationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
13+
IResourceService<TelevisionStation, int> resourceService)
1314
: base(options, resourceGraph, loggerFactory, resourceService)
1415
{
1516
}

‎test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Controllers
2121
[Route("/operations/musicTracks/create")]
2222
public sealed class CreateMusicTrackOperationsController : JsonApiOperationsController
2323
{
24-
public CreateMusicTrackOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
25-
IJsonApiRequest request, ITargetedFields targetedFields)
24+
public CreateMusicTrackOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
25+
IOperationsProcessor processor, IJsonApiRequest request, ITargetedFields targetedFields)
2626
: base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
2727
{
2828
}

0 commit comments

Comments
 (0)