Consistency renames of parameters for schema types

Author: bkoelman

Diff for: src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/DataContainerSchemaGenerator.cs

@@ -32,19 +32,19 @@ public OpenApiSchema GenerateSchemaForCommonResourceDataInResponse(SchemaReposit
         return _dataSchemaGenerator.GenerateSchemaForCommonData(typeof(ResourceInResponse), schemaRepository);
     }
 
-    public OpenApiSchema GenerateSchema(Type dataContainerConstructedType, ResourceType resourceType, bool forRequestSchema, bool canIncludeRelated,
+    public OpenApiSchema GenerateSchema(Type dataContainerSchemaType, ResourceType resourceType, bool forRequestSchema, bool canIncludeRelated,
         SchemaRepository schemaRepository)
     {
-        ArgumentNullException.ThrowIfNull(dataContainerConstructedType);
+        ArgumentNullException.ThrowIfNull(dataContainerSchemaType);
         ArgumentNullException.ThrowIfNull(resourceType);
         ArgumentNullException.ThrowIfNull(schemaRepository);
 
-        if (schemaRepository.TryLookupByType(dataContainerConstructedType, out OpenApiSchema referenceSchemaForData))
+        if (schemaRepository.TryLookupByType(dataContainerSchemaType, out OpenApiSchema referenceSchemaForData))
         {
             return referenceSchemaForData;
         }
 
-        Type dataConstructedType = GetElementTypeOfDataProperty(dataContainerConstructedType, resourceType);
+        Type dataConstructedType = GetElementTypeOfDataProperty(dataContainerSchemaType, resourceType);
 
         if (canIncludeRelated)
         {

Diff for: src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/Components/LinksVisibilitySchemaGenerator.cs

@@ -70,12 +70,12 @@ public LinksVisibilitySchemaGenerator(IJsonApiOptions options, IResourceGraph re
         _lazyLinksVisibility = new Lazy<LinksVisibility>(() => new LinksVisibility(options, resourceGraph), LazyThreadSafetyMode.ExecutionAndPublication);
     }
 
-    public void UpdateSchemaForTopLevel(Type modelType, OpenApiSchema fullSchemaForLinksContainer, SchemaRepository schemaRepository)
+    public void UpdateSchemaForTopLevel(Type schemaType, OpenApiSchema fullSchemaForLinksContainer, SchemaRepository schemaRepository)
     {
-        ArgumentNullException.ThrowIfNull(modelType);
+        ArgumentNullException.ThrowIfNull(schemaType);
         ArgumentNullException.ThrowIfNull(fullSchemaForLinksContainer);
 
-        Type lookupType = modelType.ConstructedToOpenType();
+        Type lookupType = schemaType.ConstructedToOpenType();
 
         if (LinksInJsonApiSchemaTypes.TryGetValue(lookupType, out LinkTypes possibleLinkTypes))
         {
@@ -94,12 +94,12 @@ public void UpdateSchemaForResource(ResourceSchemaType resourceSchemaType, OpenA
         }
     }
 
-    public void UpdateSchemaForRelationship(Type modelType, OpenApiSchema fullSchemaForRelationship, SchemaRepository schemaRepository)
+    public void UpdateSchemaForRelationship(Type schemaType, OpenApiSchema fullSchemaForRelationship, SchemaRepository schemaRepository)
     {
-        ArgumentNullException.ThrowIfNull(modelType);
+        ArgumentNullException.ThrowIfNull(schemaType);
         ArgumentNullException.ThrowIfNull(fullSchemaForRelationship);
 
-        Type lookupType = modelType.ConstructedToOpenType();
+        Type lookupType = schemaType.ConstructedToOpenType();
 
         if (LinksInJsonApiSchemaTypes.TryGetValue(lookupType, out LinkTypes possibleLinkTypes))
         {

Diff for: src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaGenerators/JsonApiSchemaGenerator.cs

@@ -23,19 +23,19 @@ public JsonApiSchemaGenerator(ResourceIdSchemaGenerator resourceIdSchemaGenerato
         _documentSchemaGenerators = documentSchemaGenerators as DocumentSchemaGenerator[] ?? documentSchemaGenerators.ToArray();
     }
 
-    public OpenApiSchema GenerateSchema(Type modelType, SchemaRepository schemaRepository, MemberInfo? memberInfo = null, ParameterInfo? parameterInfo = null,
+    public OpenApiSchema GenerateSchema(Type schemaType, SchemaRepository schemaRepository, MemberInfo? memberInfo = null, ParameterInfo? parameterInfo = null,
         ApiParameterRouteInfo? routeInfo = null)
     {
-        ArgumentNullException.ThrowIfNull(modelType);
+        ArgumentNullException.ThrowIfNull(schemaType);
         ArgumentNullException.ThrowIfNull(schemaRepository);
 
         if (parameterInfo is { Name: "id" } && IsJsonApiParameter(parameterInfo))
         {
-            return _resourceIdSchemaGenerator.GenerateSchema(modelType, schemaRepository);
+            return _resourceIdSchemaGenerator.GenerateSchema(schemaType, schemaRepository);
         }
 
-        DocumentSchemaGenerator schemaGenerator = GetDocumentSchemaGenerator(modelType);
-        OpenApiSchema referenceSchema = schemaGenerator.GenerateSchema(modelType, schemaRepository);
+        DocumentSchemaGenerator schemaGenerator = GetDocumentSchemaGenerator(schemaType);
+        OpenApiSchema referenceSchema = schemaGenerator.GenerateSchema(schemaType, schemaRepository);
 
         if (memberInfo != null || parameterInfo != null)
         {
@@ -52,11 +52,11 @@ private static bool IsJsonApiParameter(ParameterInfo parameter)
         return parameter.Member.DeclaringType != null && parameter.Member.DeclaringType.IsAssignableTo(typeof(CoreJsonApiController));
     }
 
-    private DocumentSchemaGenerator GetDocumentSchemaGenerator(Type modelType)
+    private DocumentSchemaGenerator GetDocumentSchemaGenerator(Type schemaType)
     {
         foreach (DocumentSchemaGenerator documentSchemaGenerator in _documentSchemaGenerators)
         {
-            if (documentSchemaGenerator.CanGenerate(modelType))
+            if (documentSchemaGenerator.CanGenerate(schemaType))
             {
                 return documentSchemaGenerator;
             }