Skip to content

Commit ef2753e

Browse files
committed
Replace resource name formatter with internal one
1 parent c6d691d commit ef2753e

File tree

5 files changed

+8
-57
lines changed

5 files changed

+8
-57
lines changed

src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using Humanizer;
5+
using JsonApiDotNetCore.Configuration;
56
using JsonApiDotNetCore.Middleware;
67
using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
78
using JsonApiDotNetCore.OpenApi.JsonApiObjects.RelationshipData;
@@ -35,7 +36,7 @@ internal sealed class JsonApiOperationIdSelector
3536

3637
private readonly IControllerResourceMapping _controllerResourceMapping;
3738
private readonly NamingStrategy _namingStrategy;
38-
private readonly ResourceNameFormatterProxy _formatter;
39+
private readonly ResourceNameFormatter _formatter;
3940

4041
public JsonApiOperationIdSelector(IControllerResourceMapping controllerResourceMapping, NamingStrategy namingStrategy)
4142
{
@@ -44,7 +45,7 @@ public JsonApiOperationIdSelector(IControllerResourceMapping controllerResourceM
4445

4546
_controllerResourceMapping = controllerResourceMapping;
4647
_namingStrategy = namingStrategy;
47-
_formatter = new ResourceNameFormatterProxy(namingStrategy);
48+
_formatter = new ResourceNameFormatter(namingStrategy);
4849
}
4950

5051
public string GetOperationId(ApiDescription endpoint)

src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ internal sealed class JsonApiSchemaIdSelector
3030
[typeof(ResourceIdentifierObject<>)] = "###-identifier"
3131
};
3232

33-
private readonly ResourceNameFormatterProxy _formatter;
33+
private readonly ResourceNameFormatter _formatter;
3434
private readonly IResourceContextProvider _resourceContextProvider;
3535

36-
public JsonApiSchemaIdSelector(ResourceNameFormatterProxy formatter, IResourceContextProvider resourceContextProvider)
36+
public JsonApiSchemaIdSelector(ResourceNameFormatter formatter, IResourceContextProvider resourceContextProvider)
3737
{
3838
ArgumentGuard.NotNull(formatter, nameof(formatter));
3939
ArgumentGuard.NotNull(resourceContextProvider, nameof(resourceContextProvider));

src/JsonApiDotNetCore.OpenApi/ResourceNameFormatterProxy.cs

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private static IList<string> GetOperationTags(ApiDescription description, IContr
104104
private static void SetSchemaIdSelector(SwaggerGenOptions swaggerGenOptions, IResourceContextProvider resourceContextProvider,
105105
NamingStrategy namingStrategy)
106106
{
107-
ResourceNameFormatterProxy resourceNameFormatter = new(namingStrategy);
107+
ResourceNameFormatter resourceNameFormatter = new(namingStrategy);
108108
JsonApiSchemaIdSelector jsonApiObjectSchemaSelector = new(resourceNameFormatter, resourceContextProvider);
109109

110110
swaggerGenOptions.CustomSchemaIds(type => jsonApiObjectSchemaSelector.GetSchemaId(type));

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ private static Func<ResourceTypeInfo, ResourceFieldObjectSchemaBuilder> CreateFi
4141
ResourceTypeSchemaGenerator resourceTypeSchemaGenerator)
4242
{
4343
NamingStrategy namingStrategy = ((DefaultContractResolver)jsonApiOptions.SerializerSettings.ContractResolver)!.NamingStrategy;
44-
ResourceNameFormatterProxy resourceNameFormatterProxy = new(namingStrategy);
45-
var jsonApiSchemaIdSelector = new JsonApiSchemaIdSelector(resourceNameFormatterProxy, resourceContextProvider);
44+
ResourceNameFormatter resourceNameFormatter = new(namingStrategy);
45+
var jsonApiSchemaIdSelector = new JsonApiSchemaIdSelector(resourceNameFormatter, resourceContextProvider);
4646

4747
return resourceTypeInfo => new ResourceFieldObjectSchemaBuilder(resourceTypeInfo, schemaRepositoryAccessor, defaultSchemaGenerator,
4848
jsonApiSchemaIdSelector, resourceTypeSchemaGenerator);

0 commit comments

Comments
 (0)