Skip to content

Commit c6c2b74

Browse files
author
Bart Koelman
committed
Reformat codebase (using newer C# version now) to fix cibuild
1 parent d036d61 commit c6c2b74

File tree

183 files changed

+401
-396
lines changed

Some content is hidden

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

183 files changed

+401
-396
lines changed

benchmarks/Query/QueryParserBenchmarks.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ namespace Benchmarks.Query
2020
[MemoryDiagnoser]
2121
public class QueryParserBenchmarks
2222
{
23-
private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
24-
private readonly FakeRequestQueryStringAccessor _queryStringAccessor = new FakeRequestQueryStringAccessor();
23+
private readonly DependencyFactory _dependencyFactory = new();
24+
private readonly FakeRequestQueryStringAccessor _queryStringAccessor = new();
2525
private readonly QueryStringReader _queryStringReaderForSort;
2626
private readonly QueryStringReader _queryStringReaderForAll;
2727

benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class JsonApiDeserializerBenchmarks
2929
}
3030
});
3131

32-
private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
32+
private readonly DependencyFactory _dependencyFactory = new();
3333
private readonly IJsonApiDeserializer _jsonApiDeserializer;
3434

3535
public JsonApiDeserializerBenchmarks()

benchmarks/Serialization/JsonApiSerializerBenchmarks.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ namespace Benchmarks.Serialization
1515
[MarkdownExporter]
1616
public class JsonApiSerializerBenchmarks
1717
{
18-
private static readonly BenchmarkResource Content = new BenchmarkResource
18+
private static readonly BenchmarkResource Content = new()
1919
{
2020
Id = 123,
2121
Name = Guid.NewGuid().ToString()
2222
};
2323

24-
private readonly DependencyFactory _dependencyFactory = new DependencyFactory();
24+
private readonly DependencyFactory _dependencyFactory = new();
2525
private readonly IJsonApiSerializer _jsonApiSerializer;
2626

2727
public JsonApiSerializerBenchmarks()

src/Examples/JsonApiDotNetCoreExample/Definitions/ArticleHooksDefinition.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ public ArticleHooksDefinition(IResourceGraph resourceGraph)
2121

2222
public override IEnumerable<Article> OnReturn(HashSet<Article> resources, ResourcePipeline pipeline)
2323
{
24-
if (pipeline == ResourcePipeline.GetSingle && resources.Any(article => article.Caption == "Classified"))
24+
[AssertionMethod]
25+
static bool Predicate(Article article)
26+
{
27+
return article.Caption == "Classified";
28+
}
29+
30+
if (pipeline == ResourcePipeline.GetSingle && resources.Any(Predicate))
2531
{
2632
throw new JsonApiException(new Error(HttpStatusCode.Forbidden)
2733
{

src/Examples/ReportsExample/Services/ReportService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private IReadOnlyCollection<Report> GetReports()
3131
{
3232
return new List<Report>
3333
{
34-
new Report
34+
new()
3535
{
3636
Title = "Status Report",
3737
Statistics = new ReportStatistics

src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace JsonApiDotNetCore.AtomicOperations.Processors
1414
public class SetRelationshipProcessor<TResource, TId> : ISetRelationshipProcessor<TResource, TId>
1515
where TResource : class, IIdentifiable<TId>
1616
{
17-
private readonly CollectionConverter _collectionConverter = new CollectionConverter();
17+
private readonly CollectionConverter _collectionConverter = new();
1818
private readonly ISetRelationshipService<TResource, TId> _service;
1919

2020
public SetRelationshipProcessor(ISetRelationshipService<TResource, TId> service)

src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace JsonApiDotNetCore.Configuration
3434
/// </summary>
3535
internal sealed class JsonApiApplicationBuilder : IJsonApiApplicationBuilder, IDisposable
3636
{
37-
private readonly JsonApiOptions _options = new JsonApiOptions();
37+
private readonly JsonApiOptions _options = new();
3838
private readonly IServiceCollection _services;
3939
private readonly IMvcCoreBuilder _mvcBuilder;
4040
private readonly ResourceGraphBuilder _resourceGraphBuilder;

src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public sealed class JsonApiOptions : IJsonApiOptions
3737
public bool IncludeTotalResourceCount { get; set; }
3838

3939
/// <inheritdoc />
40-
public PageSize DefaultPageSize { get; set; } = new PageSize(10);
40+
public PageSize DefaultPageSize { get; set; } = new(10);
4141

4242
/// <inheritdoc />
4343
public PageSize MaximumPageSize { get; set; }
@@ -79,7 +79,7 @@ public sealed class JsonApiOptions : IJsonApiOptions
7979
public IsolationLevel? TransactionIsolationLevel { get; set; }
8080

8181
/// <inheritdoc />
82-
public JsonSerializerSettings SerializerSettings { get; } = new JsonSerializerSettings
82+
public JsonSerializerSettings SerializerSettings { get; } = new()
8383
{
8484
ContractResolver = new DefaultContractResolver
8585
{

src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEnt
4141

4242
var httpContextAccessor = _serviceProvider.GetRequiredService<IHttpContextAccessor>();
4343

44-
if (httpContextAccessor.HttpContext.Request.Method == HttpMethods.Patch || request.OperationKind == OperationKind.UpdateResource)
44+
if (httpContextAccessor.HttpContext!.Request.Method == HttpMethods.Patch || request.OperationKind == OperationKind.UpdateResource)
4545
{
4646
var targetedFields = _serviceProvider.GetRequiredService<ITargetedFields>();
4747
return IsFieldTargeted(entry, targetedFields);

src/JsonApiDotNetCore/Configuration/PageNumber.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace JsonApiDotNetCore.Configuration
66
[PublicAPI]
77
public sealed class PageNumber : IEquatable<PageNumber>
88
{
9-
public static readonly PageNumber ValueOne = new PageNumber(1);
9+
public static readonly PageNumber ValueOne = new(1);
1010

1111
public int OneBasedValue { get; }
1212

0 commit comments

Comments
 (0)