Reorder constructor parameters: IJsonApiOptions before IResourceGraph

Author: bkoelman

src/JsonApiDotNetCore.OpenApi.Swashbuckle/ConfigureSwaggerGenOptions.cs

@@ -24,22 +24,22 @@ internal sealed class ConfigureSwaggerGenOptions : IConfigureOptions<SwaggerGenO
         typeof(RemoveFromRelationshipOperation<>)
     ];
 
-    private readonly IControllerResourceMapping _controllerResourceMapping;
-    private readonly OpenApiOperationIdSelector _openApiOperationIdSelector;
+    private readonly OpenApiOperationIdSelector _operationIdSelector;
     private readonly JsonApiSchemaIdSelector _schemaIdSelector;
+    private readonly IControllerResourceMapping _controllerResourceMapping;
     private readonly IResourceGraph _resourceGraph;
 
-    public ConfigureSwaggerGenOptions(IControllerResourceMapping controllerResourceMapping, OpenApiOperationIdSelector openApiOperationIdSelector,
-        JsonApiSchemaIdSelector schemaIdSelector, IResourceGraph resourceGraph)
+    public ConfigureSwaggerGenOptions(OpenApiOperationIdSelector operationIdSelector, JsonApiSchemaIdSelector schemaIdSelector,
+        IControllerResourceMapping controllerResourceMapping, IResourceGraph resourceGraph)
     {
-        ArgumentGuard.NotNull(controllerResourceMapping);
-        ArgumentGuard.NotNull(openApiOperationIdSelector);
+        ArgumentGuard.NotNull(operationIdSelector);
         ArgumentGuard.NotNull(schemaIdSelector);
+        ArgumentGuard.NotNull(controllerResourceMapping);
         ArgumentGuard.NotNull(resourceGraph);
 
-        _controllerResourceMapping = controllerResourceMapping;
-        _openApiOperationIdSelector = openApiOperationIdSelector;
+        _operationIdSelector = operationIdSelector;
         _schemaIdSelector = schemaIdSelector;
+        _controllerResourceMapping = controllerResourceMapping;
         _resourceGraph = resourceGraph;
     }
 
@@ -54,7 +54,7 @@ public void Configure(SwaggerGenOptions options)
         options.SelectSubTypesUsing(SelectDerivedTypes);
 
         options.TagActionsBy(description => GetOpenApiOperationTags(description, _controllerResourceMapping));
-        options.CustomOperationIds(_openApiOperationIdSelector.GetOpenApiOperationId);
+        options.CustomOperationIds(_operationIdSelector.GetOpenApiOperationId);
         options.CustomSchemaIds(_schemaIdSelector.GetSchemaId);
 
         options.DocumentFilter<ServerDocumentFilter>();

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiSchemaIdSelector.cs

@@ -64,16 +64,16 @@ internal sealed class JsonApiSchemaIdSelector
         [typeof(RemoveFromRelationshipOperation<>)] = "Temporary Remove From [ResourceName] To Many Relationship Operation"
     };
 
-    private readonly IResourceGraph _resourceGraph;
     private readonly IJsonApiOptions _options;
+    private readonly IResourceGraph _resourceGraph;
 
-    public JsonApiSchemaIdSelector(IResourceGraph resourceGraph, IJsonApiOptions options)
+    public JsonApiSchemaIdSelector(IJsonApiOptions options, IResourceGraph resourceGraph)
     {
-        ArgumentGuard.NotNull(resourceGraph);
         ArgumentGuard.NotNull(options);
+        ArgumentGuard.NotNull(resourceGraph);
 
-        _resourceGraph = resourceGraph;
         _options = options;
+        _resourceGraph = resourceGraph;
     }
 
     public string GetSchemaId(Type type)

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/AtomicOperationsBodySchemaGenerator.cs

@@ -23,16 +23,16 @@ internal sealed class AtomicOperationsBodySchemaGenerator : BodySchemaGenerator
     private readonly AbstractAtomicOperationSchemaGenerator _abstractAtomicOperationSchemaGenerator;
     private readonly DataContainerSchemaGenerator _dataContainerSchemaGenerator;
     private readonly IAtomicOperationFilter _atomicOperationFilter;
-    private readonly JsonApiSchemaIdSelector _jsonApiSchemaIdSelector;
+    private readonly JsonApiSchemaIdSelector _schemaIdSelector;
     private readonly ResourceFieldValidationMetadataProvider _resourceFieldValidationMetadataProvider;
     private readonly IResourceGraph _resourceGraph;
 
     public AtomicOperationsBodySchemaGenerator(SchemaGenerator defaultSchemaGenerator, AtomicOperationCodeSchemaGenerator atomicOperationCodeSchemaGenerator,
         ResourceIdentifierSchemaGenerator resourceIdentifierSchemaGenerator, RelationshipIdentifierSchemaGenerator relationshipIdentifierSchemaGenerator,
         AbstractAtomicOperationSchemaGenerator abstractAtomicOperationSchemaGenerator, DataContainerSchemaGenerator dataContainerSchemaGenerator,
         MetaSchemaGenerator metaSchemaGenerator, LinksVisibilitySchemaGenerator linksVisibilitySchemaGenerator, IAtomicOperationFilter atomicOperationFilter,
-        JsonApiSchemaIdSelector jsonApiSchemaIdSelector, ResourceFieldValidationMetadataProvider resourceFieldValidationMetadataProvider,
-        IResourceGraph resourceGraph, IJsonApiOptions options)
+        JsonApiSchemaIdSelector schemaIdSelector, ResourceFieldValidationMetadataProvider resourceFieldValidationMetadataProvider, IJsonApiOptions options,
+        IResourceGraph resourceGraph)
         : base(metaSchemaGenerator, linksVisibilitySchemaGenerator, options)
     {
         ArgumentGuard.NotNull(defaultSchemaGenerator);
@@ -42,10 +42,9 @@ public AtomicOperationsBodySchemaGenerator(SchemaGenerator defaultSchemaGenerato
         ArgumentGuard.NotNull(abstractAtomicOperationSchemaGenerator);
         ArgumentGuard.NotNull(dataContainerSchemaGenerator);
         ArgumentGuard.NotNull(atomicOperationFilter);
-        ArgumentGuard.NotNull(jsonApiSchemaIdSelector);
+        ArgumentGuard.NotNull(schemaIdSelector);
         ArgumentGuard.NotNull(resourceFieldValidationMetadataProvider);
         ArgumentGuard.NotNull(resourceGraph);
-        ArgumentGuard.NotNull(options);
 
         _defaultSchemaGenerator = defaultSchemaGenerator;
         _atomicOperationCodeSchemaGenerator = atomicOperationCodeSchemaGenerator;
@@ -54,7 +53,7 @@ public AtomicOperationsBodySchemaGenerator(SchemaGenerator defaultSchemaGenerato
         _abstractAtomicOperationSchemaGenerator = abstractAtomicOperationSchemaGenerator;
         _dataContainerSchemaGenerator = dataContainerSchemaGenerator;
         _atomicOperationFilter = atomicOperationFilter;
-        _jsonApiSchemaIdSelector = jsonApiSchemaIdSelector;
+        _schemaIdSelector = schemaIdSelector;
         _resourceFieldValidationMetadataProvider = resourceFieldValidationMetadataProvider;
         _resourceGraph = resourceGraph;
     }
@@ -147,7 +146,7 @@ private void GenerateSchemaForResourceOperation(Type operationOpenType, Resource
         OpenApiSchema fullSchemaForDerivedType = fullSchemaForOperation.UnwrapLastExtendedSchema();
         SetOperationCode(fullSchemaForDerivedType, operationCode, schemaRepository);
 
-        string discriminatorValue = _jsonApiSchemaIdSelector.GetAtomicOperationDiscriminatorValue(operationCode, resourceType);
+        string discriminatorValue = _schemaIdSelector.GetAtomicOperationDiscriminatorValue(operationCode, resourceType);
         _abstractAtomicOperationSchemaGenerator.MapDiscriminator(referenceSchemaForOperation, discriminatorValue, schemaRepository);
     }
 
@@ -188,7 +187,7 @@ private void GenerateSchemaForRelationshipOperation(Type operationOpenType, Rela
         // This complicated implementation that generates a temporary schema stems from the fact that GetSchemaId takes a Type.
         // We could feed it a constructed type with TLeftResource and TRightResource, but there's no way to include
         // the relationship name because there's no runtime Type available for it.
-        string schemaId = _jsonApiSchemaIdSelector.GetRelationshipAtomicOperationSchemaId(relationship, operationCode);
+        string schemaId = _schemaIdSelector.GetRelationshipAtomicOperationSchemaId(relationship, operationCode);
 
         OpenApiSchema referenceSchemaForOperation = _defaultSchemaGenerator.GenerateSchema(operationConstructedType, schemaRepository);
         OpenApiSchema fullSchemaForOperation = schemaRepository.Schemas[referenceSchemaForOperation.Reference.Id];
@@ -203,7 +202,7 @@ private void GenerateSchemaForRelationshipOperation(Type operationOpenType, Rela
         schemaRepository.ReplaceSchemaId(operationConstructedType, schemaId);
         referenceSchemaForOperation.Reference.Id = schemaId;
 
-        string discriminatorValue = _jsonApiSchemaIdSelector.GetAtomicOperationDiscriminatorValue(operationCode, relationship);
+        string discriminatorValue = _schemaIdSelector.GetAtomicOperationDiscriminatorValue(operationCode, relationship);
         _abstractAtomicOperationSchemaGenerator.MapDiscriminator(referenceSchemaForOperation, discriminatorValue, schemaRepository);
     }
 

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Bodies/ResourceOrRelationshipBodySchemaGenerator.cs

@@ -38,8 +38,8 @@ internal sealed class ResourceOrRelationshipBodySchemaGenerator : BodySchemaGene
     private readonly IResourceGraph _resourceGraph;
 
     public ResourceOrRelationshipBodySchemaGenerator(SchemaGenerator defaultSchemaGenerator, DataContainerSchemaGenerator dataContainerSchemaGenerator,
-        MetaSchemaGenerator metaSchemaGenerator, LinksVisibilitySchemaGenerator linksVisibilitySchemaGenerator, IResourceGraph resourceGraph,
-        IJsonApiOptions options)
+        MetaSchemaGenerator metaSchemaGenerator, LinksVisibilitySchemaGenerator linksVisibilitySchemaGenerator, IJsonApiOptions options,
+        IResourceGraph resourceGraph)
         : base(metaSchemaGenerator, linksVisibilitySchemaGenerator, options)
     {
         ArgumentGuard.NotNull(defaultSchemaGenerator);

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataSchemaGenerator.cs

@@ -27,16 +27,16 @@ internal sealed class DataSchemaGenerator
     private readonly ResourceIdSchemaGenerator _resourceIdSchemaGenerator;
     private readonly ResourceIdentifierSchemaGenerator _resourceIdentifierSchemaGenerator;
     private readonly LinksVisibilitySchemaGenerator _linksVisibilitySchemaGenerator;
-    private readonly IResourceGraph _resourceGraph;
     private readonly IJsonApiOptions _options;
+    private readonly IResourceGraph _resourceGraph;
     private readonly ResourceFieldValidationMetadataProvider _resourceFieldValidationMetadataProvider;
     private readonly RelationshipTypeFactory _relationshipTypeFactory;
     private readonly ResourceDocumentationReader _resourceDocumentationReader;
 
     public DataSchemaGenerator(SchemaGenerator defaultSchemaGenerator, GenerationCacheSchemaGenerator generationCacheSchemaGenerator,
         ResourceTypeSchemaGenerator resourceTypeSchemaGenerator, ResourceIdSchemaGenerator resourceIdSchemaGenerator,
         ResourceIdentifierSchemaGenerator resourceIdentifierSchemaGenerator, LinksVisibilitySchemaGenerator linksVisibilitySchemaGenerator,
-        IResourceGraph resourceGraph, IJsonApiOptions options, ResourceFieldValidationMetadataProvider resourceFieldValidationMetadataProvider,
+        IJsonApiOptions options, IResourceGraph resourceGraph, ResourceFieldValidationMetadataProvider resourceFieldValidationMetadataProvider,
         RelationshipTypeFactory relationshipTypeFactory, ResourceDocumentationReader resourceDocumentationReader)
     {
         ArgumentGuard.NotNull(defaultSchemaGenerator);
@@ -45,8 +45,8 @@ public DataSchemaGenerator(SchemaGenerator defaultSchemaGenerator, GenerationCac
         ArgumentGuard.NotNull(resourceIdSchemaGenerator);
         ArgumentGuard.NotNull(resourceIdentifierSchemaGenerator);
         ArgumentGuard.NotNull(linksVisibilitySchemaGenerator);
-        ArgumentGuard.NotNull(resourceGraph);
         ArgumentGuard.NotNull(options);
+        ArgumentGuard.NotNull(resourceGraph);
         ArgumentGuard.NotNull(resourceFieldValidationMetadataProvider);
         ArgumentGuard.NotNull(relationshipTypeFactory);
         ArgumentGuard.NotNull(resourceDocumentationReader);
@@ -57,8 +57,8 @@ public DataSchemaGenerator(SchemaGenerator defaultSchemaGenerator, GenerationCac
         _resourceIdSchemaGenerator = resourceIdSchemaGenerator;
         _resourceIdentifierSchemaGenerator = resourceIdentifierSchemaGenerator;
         _linksVisibilitySchemaGenerator = linksVisibilitySchemaGenerator;
-        _resourceGraph = resourceGraph;
         _options = options;
+        _resourceGraph = resourceGraph;
         _resourceFieldValidationMetadataProvider = resourceFieldValidationMetadataProvider;
         _relationshipTypeFactory = relationshipTypeFactory;
         _resourceDocumentationReader = resourceDocumentationReader;

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs

@@ -62,12 +62,12 @@ internal sealed class LinksVisibilitySchemaGenerator
 
     private readonly Lazy<LinksVisibility> _lazyLinksVisibility;
 
-    public LinksVisibilitySchemaGenerator(IResourceGraph resourceGraph, IJsonApiOptions options)
+    public LinksVisibilitySchemaGenerator(IJsonApiOptions options, IResourceGraph resourceGraph)
     {
-        ArgumentGuard.NotNull(resourceGraph);
         ArgumentGuard.NotNull(options);
+        ArgumentGuard.NotNull(resourceGraph);
 
-        _lazyLinksVisibility = new Lazy<LinksVisibility>(() => new LinksVisibility(resourceGraph, options), LazyThreadSafetyMode.ExecutionAndPublication);
+        _lazyLinksVisibility = new Lazy<LinksVisibility>(() => new LinksVisibility(options, resourceGraph), LazyThreadSafetyMode.ExecutionAndPublication);
     }
 
     public void UpdateSchemaForTopLevel(Type modelType, OpenApiSchema fullSchemaForLinksContainer, SchemaRepository schemaRepository)
@@ -142,10 +142,10 @@ private sealed class LinksVisibility
         public LinkTypes ResourceLinks { get; }
         public LinkTypes RelationshipLinks { get; }
 
-        public LinksVisibility(IResourceGraph resourceGraph, IJsonApiOptions options)
+        public LinksVisibility(IJsonApiOptions options, IResourceGraph resourceGraph)
         {
-            ArgumentGuard.NotNull(resourceGraph);
             ArgumentGuard.NotNull(options);
+            ArgumentGuard.NotNull(resourceGraph);
 
             var unionTopLevelLinks = LinkTypes.None;
             var unionResourceLinks = LinkTypes.None;

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/RelationshipIdentifierSchemaGenerator.cs

@@ -22,31 +22,31 @@ internal sealed class RelationshipIdentifierSchemaGenerator
     private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;
     private readonly ResourceIdSchemaGenerator _resourceIdSchemaGenerator;
     private readonly RelationshipNameSchemaGenerator _relationshipNameSchemaGenerator;
-    private readonly JsonApiSchemaIdSelector _jsonApiSchemaIdSelector;
+    private readonly JsonApiSchemaIdSelector _schemaIdSelector;
 
     public RelationshipIdentifierSchemaGenerator(SchemaGenerator defaultSchemaGenerator, ResourceTypeSchemaGenerator resourceTypeSchemaGenerator,
         ResourceIdSchemaGenerator resourceIdSchemaGenerator, RelationshipNameSchemaGenerator relationshipNameSchemaGenerator,
-        JsonApiSchemaIdSelector jsonApiSchemaIdSelector)
+        JsonApiSchemaIdSelector schemaIdSelector)
     {
         ArgumentGuard.NotNull(defaultSchemaGenerator);
         ArgumentGuard.NotNull(resourceTypeSchemaGenerator);
         ArgumentGuard.NotNull(resourceIdSchemaGenerator);
         ArgumentGuard.NotNull(relationshipNameSchemaGenerator);
-        ArgumentGuard.NotNull(jsonApiSchemaIdSelector);
+        ArgumentGuard.NotNull(schemaIdSelector);
 
         _defaultSchemaGenerator = defaultSchemaGenerator;
         _resourceTypeSchemaGenerator = resourceTypeSchemaGenerator;
         _resourceIdSchemaGenerator = resourceIdSchemaGenerator;
         _relationshipNameSchemaGenerator = relationshipNameSchemaGenerator;
-        _jsonApiSchemaIdSelector = jsonApiSchemaIdSelector;
+        _schemaIdSelector = schemaIdSelector;
     }
 
     public OpenApiSchema GenerateSchema(RelationshipAttribute relationship, SchemaRepository schemaRepository)
     {
         ArgumentGuard.NotNull(relationship);
         ArgumentGuard.NotNull(schemaRepository);
 
-        string schemaId = _jsonApiSchemaIdSelector.GetRelationshipIdentifierSchemaId(relationship);
+        string schemaId = _schemaIdSelector.GetRelationshipIdentifierSchemaId(relationship);
 
         if (schemaRepository.Schemas.ContainsKey(schemaId))
         {

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/JsonApiDataContractResolver.cs

@@ -11,13 +11,13 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 /// </summary>
 internal sealed class JsonApiDataContractResolver : ISerializerDataContractResolver
 {
-    private readonly JsonSerializerDataContractResolver _dataContractResolver;
     private readonly IResourceGraph _resourceGraph;
+    private readonly JsonSerializerDataContractResolver _dataContractResolver;
 
-    public JsonApiDataContractResolver(IResourceGraph resourceGraph, IJsonApiOptions options)
+    public JsonApiDataContractResolver(IJsonApiOptions options, IResourceGraph resourceGraph)
     {
-        ArgumentGuard.NotNull(resourceGraph);
         ArgumentGuard.NotNull(options);
+        ArgumentGuard.NotNull(resourceGraph);
 
         _resourceGraph = resourceGraph;
         _dataContractResolver = new JsonSerializerDataContractResolver(options.SerializerOptions);