Skip to content

Commit 4f5ee42

Browse files
author
Bart Koelman
committed
Small cleanups
1 parent 41c24c4 commit 4f5ee42

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Reflection;
5-
using System.Text.Json;
65
using JsonApiDotNetCore.Configuration;
76
using JsonApiDotNetCore.Resources;
87
using JsonApiDotNetCore.Resources.Annotations;
@@ -18,15 +17,13 @@ internal sealed class JsonApiDataContractResolver : ISerializerDataContractResol
1817
private readonly JsonSerializerDataContractResolver _dataContractResolver;
1918
private readonly IResourceGraph _resourceGraph;
2019

21-
public JsonApiDataContractResolver(IResourceGraph resourceGraph, IJsonApiOptions jsonApiOptions)
20+
public JsonApiDataContractResolver(IResourceGraph resourceGraph, IJsonApiOptions options)
2221
{
2322
ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
24-
ArgumentGuard.NotNull(jsonApiOptions, nameof(jsonApiOptions));
23+
ArgumentGuard.NotNull(options, nameof(options));
2524

2625
_resourceGraph = resourceGraph;
27-
28-
JsonSerializerOptions serializerOptions = jsonApiOptions.SerializerOptions;
29-
_dataContractResolver = new JsonSerializerDataContractResolver(serializerOptions);
26+
_dataContractResolver = new JsonSerializerDataContractResolver(options.SerializerOptions);
3027
}
3128

3229
public DataContract GetDataContractForType(Type type)

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,16 @@ internal sealed class JsonApiSchemaGenerator : ISchemaGenerator
4040
private readonly JsonApiObjectNullabilityProcessor _jsonApiObjectNullabilityProcessor;
4141
private readonly SchemaRepositoryAccessor _schemaRepositoryAccessor = new();
4242

43-
public JsonApiSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions jsonApiOptions)
43+
public JsonApiSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions options)
4444
{
4545
ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
4646
ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
47-
ArgumentGuard.NotNull(jsonApiOptions, nameof(jsonApiOptions));
47+
ArgumentGuard.NotNull(options, nameof(options));
4848

4949
_defaultSchemaGenerator = defaultSchemaGenerator;
5050
_nullableReferenceSchemaGenerator = new NullableReferenceSchemaGenerator(_schemaRepositoryAccessor);
5151
_jsonApiObjectNullabilityProcessor = new JsonApiObjectNullabilityProcessor(_schemaRepositoryAccessor);
52-
53-
_resourceObjectSchemaGenerator =
54-
new ResourceObjectSchemaGenerator(defaultSchemaGenerator, resourceGraph, jsonApiOptions, _schemaRepositoryAccessor);
52+
_resourceObjectSchemaGenerator = new ResourceObjectSchemaGenerator(defaultSchemaGenerator, resourceGraph, options, _schemaRepositoryAccessor);
5553
}
5654

5755
public OpenApiSchema GenerateSchema(Type type, SchemaRepository schemaRepository, MemberInfo memberInfo = null, ParameterInfo parameterInfo = null)

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,30 @@ internal sealed class ResourceObjectSchemaGenerator
1717
private readonly bool _allowClientGeneratedIds;
1818
private readonly Func<ResourceTypeInfo, ResourceFieldObjectSchemaBuilder> _createFieldObjectBuilderFactory;
1919

20-
public ResourceObjectSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions jsonApiOptions,
20+
public ResourceObjectSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions options,
2121
ISchemaRepositoryAccessor schemaRepositoryAccessor)
2222
{
2323
ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
2424
ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
25-
ArgumentGuard.NotNull(jsonApiOptions, nameof(jsonApiOptions));
25+
ArgumentGuard.NotNull(options, nameof(options));
2626
ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
2727

2828
_defaultSchemaGenerator = defaultSchemaGenerator;
2929
_resourceGraph = resourceGraph;
3030
_schemaRepositoryAccessor = schemaRepositoryAccessor;
3131

3232
_resourceTypeSchemaGenerator = new ResourceTypeSchemaGenerator(schemaRepositoryAccessor, resourceGraph);
33-
_allowClientGeneratedIds = jsonApiOptions.AllowClientGeneratedIds;
33+
_allowClientGeneratedIds = options.AllowClientGeneratedIds;
3434

35-
_createFieldObjectBuilderFactory = CreateFieldObjectBuilderFactory(defaultSchemaGenerator, resourceGraph, jsonApiOptions, schemaRepositoryAccessor,
35+
_createFieldObjectBuilderFactory = CreateFieldObjectBuilderFactory(defaultSchemaGenerator, resourceGraph, options, schemaRepositoryAccessor,
3636
_resourceTypeSchemaGenerator);
3737
}
3838

3939
private static Func<ResourceTypeInfo, ResourceFieldObjectSchemaBuilder> CreateFieldObjectBuilderFactory(SchemaGenerator defaultSchemaGenerator,
40-
IResourceGraph resourceGraph, IJsonApiOptions jsonApiOptions, ISchemaRepositoryAccessor schemaRepositoryAccessor,
40+
IResourceGraph resourceGraph, IJsonApiOptions options, ISchemaRepositoryAccessor schemaRepositoryAccessor,
4141
ResourceTypeSchemaGenerator resourceTypeSchemaGenerator)
4242
{
43-
JsonNamingPolicy namingPolicy = jsonApiOptions.SerializerOptions.PropertyNamingPolicy;
43+
JsonNamingPolicy namingPolicy = options.SerializerOptions.PropertyNamingPolicy;
4444
ResourceNameFormatter resourceNameFormatter = new(namingPolicy);
4545
var jsonApiSchemaIdSelector = new JsonApiSchemaIdSelector(resourceNameFormatter, resourceGraph);
4646

0 commit comments

Comments
 (0)