wta[ksdfdasf

Author: maurei

src/JsonApiDotNetCore.OpenApi.Client/ApiException.cs

@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 
 // ReSharper disable once CheckNamespace
-namespace OpenApiClientTests.Exceptions
+namespace JsonApiDotNetCore.OpenApi.Client.Exceptions
 {
     // We cannot rely on a generated ApiException as soon as we are generating multiple clients, see https://github.com/RicoSuter/NSwag/issues/2839#issuecomment-776647377.
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]

src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs

@@ -14,39 +14,38 @@ internal sealed class JsonApiSchemaIdSelector
     {
         private static readonly IDictionary<Type, string> OpenTypeToSchemaTemplateMap = new Dictionary<Type, string>
         {
-            [typeof(ResourcePostRequestDocument<>)] = "[Resource] Post Request Document",
-            [typeof(ResourcePatchRequestDocument<>)] = "[Resource] Patch Request Document",
-            [typeof(ResourceObjectInPostRequest<>)] = "[Resource] Data In Post Request",
-            [typeof(AttributesInPostRequest<>)] = "[Resource] Attributes In Post Request",
-            [typeof(RelationshipsInPostRequest<>)] = "[Resource] Relationships In Post Request",
-            [typeof(ResourceObjectInPatchRequest<>)] = "[Resource] Data In Patch Request",
-            [typeof(AttributesInPatchRequest<>)] = "[Resource] Attributes In Patch Request",
-            [typeof(RelationshipsInPatchRequest<>)] = "[Resource] Relationships In Patch Request",
-            [typeof(ToOneRelationshipInRequest<>)] = "To One [Resource] In Request",
-            [typeof(NullableToOneRelationshipInRequest<>)] = "nullable To One [Resource] In Request",
-            [typeof(ToManyRelationshipInRequest<>)] = "To Many [Resource] In Request",
-            [typeof(PrimaryResourceResponseDocument<>)] = "[Resource] Primary Response Document",
-            [typeof(SecondaryResourceResponseDocument<>)] = "[Resource] Secondary Response Document",
-            [typeof(NullableSecondaryResourceResponseDocument<>)] = "nullable [Resource] Secondary Response Document",
-            [typeof(ResourceCollectionResponseDocument<>)] = "[Resource] Collection Response Document",
-            [typeof(ResourceIdentifierResponseDocument<>)] = "[Resource] Identifier Response Document",
-            [typeof(NullableResourceIdentifierResponseDocument<>)] = "nullable [Resource] Identifier Response Document",
-            [typeof(ResourceIdentifierCollectionResponseDocument<>)] = "[Resource] Identifier Collection Response Document",
-            [typeof(ToOneRelationshipInResponse<>)] = "To One [Resource] In Response",
-            [typeof(NullableToOneRelationshipInResponse<>)] = "nullable To One [Resource] In Response",
-            [typeof(ToManyRelationshipInResponse<>)] = "To Many [Resource] In Response",
-            [typeof(ResourceObjectInResponse<>)] = "[Resource] Data In Response",
-            [typeof(AttributesInResponse<>)] = "[Resource] Attributes In Response",
-            [typeof(RelationshipsInResponse<>)] = "[Resource] Relationships In Response",
-            [typeof(ResourceIdentifierObject<>)] = "[Resource] Identifier"
+            [typeof(ResourcePostRequestDocument<>)] = "[ResourceName] Post Request Document",
+            [typeof(ResourcePatchRequestDocument<>)] = "[ResourceName] Patch Request Document",
+            [typeof(ResourceObjectInPostRequest<>)] = "[ResourceName] Data In Post Request",
+            [typeof(AttributesInPostRequest<>)] = "[ResourceName] Attributes In Post Request",
+            [typeof(RelationshipsInPostRequest<>)] = "[ResourceName] Relationships In Post Request",
+            [typeof(ResourceObjectInPatchRequest<>)] = "[ResourceName] Data In Patch Request",
+            [typeof(AttributesInPatchRequest<>)] = "[ResourceName] Attributes In Patch Request",
+            [typeof(RelationshipsInPatchRequest<>)] = "[ResourceName] Relationships In Patch Request",
+            [typeof(ToOneRelationshipInRequest<>)] = "To One [ResourceName] In Request",
+            [typeof(NullableToOneRelationshipInRequest<>)] = "Nullable To One [ResourceName] In Request",
+            [typeof(ToManyRelationshipInRequest<>)] = "To Many [ResourceName] In Request",
+            [typeof(PrimaryResourceResponseDocument<>)] = "[ResourceName] Primary Response Document",
+            [typeof(SecondaryResourceResponseDocument<>)] = "[ResourceName] Secondary Response Document",
+            [typeof(NullableSecondaryResourceResponseDocument<>)] = "Nullable [ResourceName] Secondary Response Document",
+            [typeof(ResourceCollectionResponseDocument<>)] = "[ResourceName] Collection Response Document",
+            [typeof(ResourceIdentifierResponseDocument<>)] = "[ResourceName] Identifier Response Document",
+            [typeof(NullableResourceIdentifierResponseDocument<>)] = "Nullable [ResourceName] Identifier Response Document",
+            [typeof(ResourceIdentifierCollectionResponseDocument<>)] = "[ResourceName] Identifier Collection Response Document",
+            [typeof(ToOneRelationshipInResponse<>)] = "To One [ResourceName] In Response",
+            [typeof(NullableToOneRelationshipInResponse<>)] = "Nullable To One [ResourceName] In Response",
+            [typeof(ToManyRelationshipInResponse<>)] = "To Many [ResourceName] In Response",
+            [typeof(ResourceObjectInResponse<>)] = "[ResourceName] Data In Response",
+            [typeof(AttributesInResponse<>)] = "[ResourceName] Attributes In Response",
+            [typeof(RelationshipsInResponse<>)] = "[ResourceName] Relationships In Response",
+            [typeof(ResourceIdentifierObject<>)] = "[ResourceName] Identifier"
         };
 
-        private readonly JsonNamingPolicy _namingPolicy;
+        private readonly JsonNamingPolicy? _namingPolicy;
         private readonly IResourceGraph _resourceGraph;
 
-        public JsonApiSchemaIdSelector(JsonNamingPolicy namingPolicy, IResourceGraph resourceGraph)
+        public JsonApiSchemaIdSelector(JsonNamingPolicy? namingPolicy, IResourceGraph resourceGraph)
         {
-            ArgumentGuard.NotNull(namingPolicy, nameof(namingPolicy));
             ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
             _namingPolicy = namingPolicy;
@@ -67,28 +66,23 @@ public string GetSchemaId(Type type)
             if (type.IsConstructedGenericType && OpenTypeToSchemaTemplateMap.ContainsKey(type.GetGenericTypeDefinition()))
             {
                 string pascalCaseSchemaIdTemplate = OpenTypeToSchemaTemplateMap[type.GetGenericTypeDefinition()];
-                Type resourceType = type.GetGenericArguments().First();
+                Type resourceClrType = type.GetGenericArguments().First();
 
                 // @formatter:wrap_chained_method_calls chop_always
                 // @formatter:keep_existing_linebreaks true
 
                 string pascalCaseSchemaId = pascalCaseSchemaIdTemplate
-                    .Replace("[ResourceName]", resourceType.Name)
+                    .Replace("[ResourceName]", resourceClrType.Name)
                     .Replace(" ", "");
 
                 // @formatter:keep_existing_linebreaks restore
                 // @formatter:wrap_chained_method_calls restore
 
-                return _namingPolicy.ConvertName(pascalCaseSchemaId);
+                return _namingPolicy != null ? _namingPolicy.ConvertName(pascalCaseSchemaId) : pascalCaseSchemaId;
             }
 
             // Used for a fixed set of types, such as jsonapi-object, links-in-many-resource-document etc.
-            return _namingPolicy.ConvertName(type.Name);
-        }
-
-        private static string Capitalize(string term)
-        {
-            return string.Concat(term[0].ToString().ToUpper(), term.AsSpan(1));
+            return _namingPolicy != null ? _namingPolicy.ConvertName(type.Name) : type.Name;
         }
     }
 }

src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs

@@ -59,15 +59,14 @@ private static void AddSwaggerGenerator(IServiceScope scope, IServiceCollection
             var resourceGraph = scope.ServiceProvider.GetRequiredService<IResourceGraph>();
             var jsonApiOptions = scope.ServiceProvider.GetRequiredService<IJsonApiOptions>();
             JsonNamingPolicy? namingPolicy = jsonApiOptions.SerializerOptions.PropertyNamingPolicy;
-            ResourceNameFormatter resourceNameFormatter = new(namingPolicy);
 
             AddSchemaGenerator(services);
 
             services.AddSwaggerGen(swaggerGenOptions =>
             {
                 swaggerGenOptions.SupportNonNullableReferenceTypes();
                 SetOperationInfo(swaggerGenOptions, controllerResourceMapping, namingPolicy);
-                SetSchemaIdSelector(swaggerGenOptions, resourceGraph, resourceNameFormatter);
+                SetSchemaIdSelector(swaggerGenOptions, resourceGraph, namingPolicy);
                 swaggerGenOptions.DocumentFilter<EndpointOrderingFilter>();
 
                 setupSwaggerGenAction?.Invoke(swaggerGenOptions);
@@ -105,7 +104,7 @@ private static IList<string> GetOperationTags(ApiDescription description, IContr
             };
         }
 
-        private static void SetSchemaIdSelector(SwaggerGenOptions swaggerGenOptions, IResourceGraph resourceGraph, ResourceNameFormatter resourceNameFormatter)
+        private static void SetSchemaIdSelector(SwaggerGenOptions swaggerGenOptions, IResourceGraph resourceGraph, JsonNamingPolicy? namingPolicy)
         {
             JsonApiSchemaIdSelector jsonApiObjectSchemaSelector = new(namingPolicy, resourceGraph);
 

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Reflection;
+using System.Text.Json;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
@@ -25,37 +26,32 @@ internal sealed class ResourceFieldObjectSchemaBuilder
         private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
         private readonly SchemaGenerator _defaultSchemaGenerator;
         private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;
-        private readonly SchemaRepository _resourceSchemaRepository;
+        private readonly SchemaRepository _resourceSchemaRepository = new();
         private readonly NullableReferenceSchemaGenerator _nullableReferenceSchemaGenerator;
         private readonly IDictionary<string, OpenApiSchema> _schemasForResourceFields;
 
         public ResourceFieldObjectSchemaBuilder(ResourceTypeInfo resourceTypeInfo, ISchemaRepositoryAccessor schemaRepositoryAccessor,
-            SchemaGenerator defaultSchemaGenerator, JsonApiSchemaIdSelector jsonApiSchemaIdSelector, ResourceTypeSchemaGenerator resourceTypeSchemaGenerator,
-            SchemaRepository resourceSchemaRepository, JsonNamingPolicy namingPolicy)
+            SchemaGenerator defaultSchemaGenerator, ResourceTypeSchemaGenerator resourceTypeSchemaGenerator, JsonNamingPolicy? namingPolicy)
         {
             ArgumentGuard.NotNull(resourceTypeInfo, nameof(resourceTypeInfo));
             ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
             ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
-            ArgumentGuard.NotNull(jsonApiSchemaIdSelector, nameof(jsonApiSchemaIdSelector));
             ArgumentGuard.NotNull(resourceTypeSchemaGenerator, nameof(resourceTypeSchemaGenerator));
-            ArgumentGuard.NotNull(resourceSchemaRepository, nameof(resourceSchemaRepository));
 
             _resourceTypeInfo = resourceTypeInfo;
             _schemaRepositoryAccessor = schemaRepositoryAccessor;
             _defaultSchemaGenerator = defaultSchemaGenerator;
-            _jsonApiSchemaIdSelector = jsonApiSchemaIdSelector;
             _resourceTypeSchemaGenerator = resourceTypeSchemaGenerator;
-            _resourceSchemaRepository = resourceSchemaRepository;
 
             _nullableReferenceSchemaGenerator = new NullableReferenceSchemaGenerator(schemaRepositoryAccessor, namingPolicy);
             _schemasForResourceFields = GetFieldSchemas();
         }
 
         private IDictionary<string, OpenApiSchema> GetFieldSchemas()
         {
-            if (!_resourceSchemaRepository.TryLookupByType(_resourceTypeInfo.ResourceType, out OpenApiSchema referenceSchemaForResource))
+            if (!_resourceSchemaRepository.TryLookupByType(_resourceTypeInfo.ResourceType.ClrType, out OpenApiSchema referenceSchemaForResource))
             {
-                referenceSchemaForResource = _defaultSchemaGenerator.GenerateSchema(_resourceTypeInfo.ResourceType, _resourceSchemaRepository);
+                referenceSchemaForResource = _defaultSchemaGenerator.GenerateSchema(_resourceTypeInfo.ResourceType.ClrType, _resourceSchemaRepository);
             }
 
             OpenApiSchema fullSchemaForResource = _resourceSchemaRepository.Schemas[referenceSchemaForResource.Reference.Id];

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs

@@ -33,7 +33,7 @@ public ResourceObjectSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IRe
             _allowClientGeneratedIds = options.AllowClientGeneratedIds;
 
             _resourceFieldObjectSchemaBuilderFactory = resourceTypeInfo => new ResourceFieldObjectSchemaBuilder(resourceTypeInfo, schemaRepositoryAccessor,
-                defaultSchemaGenerator, _resourceTypeSchemaGenerator);
+                defaultSchemaGenerator, _resourceTypeSchemaGenerator, options.SerializerOptions.PropertyNamingPolicy);
         }
 
         public OpenApiSchema GenerateSchema(Type resourceObjectType)