Skip to content

Commit 760df70

Browse files
author
Bart Koelman
committed
Removed left-over overload with single type parameter in ResourceGraphBuilder
1 parent d343c9d commit 760df70

File tree

11 files changed

+36
-51
lines changed

11 files changed

+36
-51
lines changed

‎benchmarks/Deserialization/DeserializationBenchmarkBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public abstract class DeserializationBenchmarkBase
2121
protected DeserializationBenchmarkBase()
2222
{
2323
var options = new JsonApiOptions();
24-
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<IncomingResource>().Build();
24+
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<IncomingResource, int>().Build();
2525
options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
2626
SerializerReadOptions = ((IJsonApiOptions)options).SerializerReadOptions;
2727

‎benchmarks/QueryString/QueryStringParserBenchmarks.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public QueryStringParserBenchmarks()
2929
EnableLegacyFilterNotation = true
3030
};
3131

32-
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<QueryableResource>("alt-resource-name").Build();
32+
IResourceGraph resourceGraph =
33+
new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<QueryableResource, int>("alt-resource-name").Build();
3334

3435
var request = new JsonApiRequest
3536
{

‎benchmarks/Serialization/SerializationBenchmarkBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected SerializationBenchmarkBase()
4040
}
4141
};
4242

43-
ResourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<OutgoingResource>().Build();
43+
ResourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<OutgoingResource, int>().Build();
4444
SerializerWriteOptions = ((IJsonApiOptions)options).SerializerWriteOptions;
4545

4646
// ReSharper disable VirtualMemberCallInConstructor

‎src/Examples/NoEntityFrameworkExample/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public Startup(IConfiguration configuration)
2424
// This method gets called by the runtime. Use this method to add services to the container.
2525
public void ConfigureServices(IServiceCollection services)
2626
{
27-
services.AddJsonApi(options => options.Namespace = "api/v1", resources: builder => builder.Add<WorkItem>("workItems"));
27+
services.AddJsonApi(options => options.Namespace = "api/v1", resources: builder => builder.Add<WorkItem, int>("workItems"));
2828

2929
services.AddResourceService<WorkItemService>();
3030

‎src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,6 @@ private static bool IsImplicitManyToManyJoinEntity(IEntityType entityType)
8686
#pragma warning restore EF1001 // Internal Entity Framework Core API usage.
8787
}
8888

89-
/// <summary>
90-
/// Adds a JSON:API resource with <code>int</code> as the identifier CLR type.
91-
/// </summary>
92-
/// <typeparam name="TResource">
93-
/// The resource CLR type.
94-
/// </typeparam>
95-
/// <param name="publicName">
96-
/// The name under which the resource is publicly exposed by the API. If nothing is specified, the naming convention is applied on the pluralized CLR
97-
/// type name.
98-
/// </param>
99-
public ResourceGraphBuilder Add<TResource>(string? publicName = null)
100-
where TResource : class, IIdentifiable<int>
101-
{
102-
return Add<TResource, int>(publicName);
103-
}
104-
10589
/// <summary>
10690
/// Adds a JSON:API resource.
10791
/// </summary>

‎test/JsonApiDotNetCoreTests/UnitTests/ModelStateValidation/ModelStateValidationTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void Renders_JSON_path_for_ModelState_key_in_resource_request(string mode
3939
{
4040
// Arrange
4141
var options = new JsonApiOptions();
42-
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<Parent>().Add<Child>().Build();
42+
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<Parent, int>().Add<Child, int>().Build();
4343

4444
var modelState = new ModelStateDictionary();
4545
modelState.AddModelError(modelStateKey, "(ignored error message)");
@@ -87,7 +87,7 @@ public void Renders_JSON_path_for_ModelState_key_in_operations_request(string mo
8787
{
8888
// Arrange
8989
var options = new JsonApiOptions();
90-
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<Parent>().Add<Child>().Build();
90+
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<Parent, int>().Add<Child, int>().Build();
9191

9292
var modelState = new ModelStateDictionary();
9393
modelState.AddModelError(modelStateKey, "(ignored error message)");

‎test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ protected BaseParseTests()
1919
// @formatter:keep_existing_linebreaks true
2020

2121
ResourceGraph = new ResourceGraphBuilder(Options, NullLoggerFactory.Instance)
22-
.Add<Blog>()
23-
.Add<BlogPost>()
24-
.Add<Label>()
25-
.Add<Comment>()
26-
.Add<WebAccount>()
27-
.Add<AccountPreferences>()
28-
.Add<LoginAttempt>()
22+
.Add<Blog, int>()
23+
.Add<BlogPost, int>()
24+
.Add<Label, int>()
25+
.Add<Comment, int>()
26+
.Add<WebAccount, int>()
27+
.Add<AccountPreferences, int>()
28+
.Add<LoginAttempt, int>()
2929
.Build();
3030

3131
// @formatter:wrap_chained_method_calls restore

‎test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void Resource_without_public_name_gets_pluralized_with_naming_convention_
2525
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
2626

2727
// Act
28-
builder.Add<ResourceWithAttribute>();
28+
builder.Add<ResourceWithAttribute, int>();
2929

3030
// Assert
3131
IResourceGraph resourceGraph = builder.Build();
@@ -42,7 +42,7 @@ public void Attribute_without_public_name_gets_naming_convention_applied()
4242
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
4343

4444
// Act
45-
builder.Add<ResourceWithAttribute>();
45+
builder.Add<ResourceWithAttribute, int>();
4646

4747
// Assert
4848
IResourceGraph resourceGraph = builder.Build();
@@ -60,7 +60,7 @@ public void HasOne_relationship_without_public_name_gets_naming_convention_appli
6060
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
6161

6262
// Act
63-
builder.Add<ResourceWithAttribute>();
63+
builder.Add<ResourceWithAttribute, int>();
6464

6565
// Assert
6666
IResourceGraph resourceGraph = builder.Build();
@@ -78,7 +78,7 @@ public void HasMany_relationship_without_public_name_gets_naming_convention_appl
7878
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
7979

8080
// Act
81-
builder.Add<ResourceWithAttribute>();
81+
builder.Add<ResourceWithAttribute, int>();
8282

8383
// Assert
8484
IResourceGraph resourceGraph = builder.Build();
@@ -94,10 +94,10 @@ public void Cannot_use_duplicate_resource_name()
9494
// Arrange
9595
var options = new JsonApiOptions();
9696
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
97-
builder.Add<ResourceWithHasOneRelationship>("duplicate");
97+
builder.Add<ResourceWithHasOneRelationship, int>("duplicate");
9898

9999
// Act
100-
Action action = () => builder.Add<ResourceWithAttribute>("duplicate");
100+
Action action = () => builder.Add<ResourceWithAttribute, int>("duplicate");
101101

102102
// Assert
103103
action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
@@ -112,7 +112,7 @@ public void Cannot_use_duplicate_attribute_name()
112112
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
113113

114114
// Act
115-
Action action = () => builder.Add<ResourceWithDuplicateAttrPublicName>();
115+
Action action = () => builder.Add<ResourceWithDuplicateAttrPublicName, int>();
116116

117117
// Assert
118118
action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
@@ -128,7 +128,7 @@ public void Cannot_use_duplicate_relationship_name()
128128
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
129129

130130
// Act
131-
Action action = () => builder.Add<ResourceWithDuplicateRelationshipPublicName>();
131+
Action action = () => builder.Add<ResourceWithDuplicateRelationshipPublicName, int>();
132132

133133
// Assert
134134
action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
@@ -144,7 +144,7 @@ public void Cannot_use_duplicate_attribute_and_relationship_name()
144144
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
145145

146146
// Act
147-
Action action = () => builder.Add<ResourceWithDuplicateAttrRelationshipPublicName>();
147+
Action action = () => builder.Add<ResourceWithDuplicateAttrRelationshipPublicName, int>();
148148

149149
// Assert
150150
action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
@@ -174,7 +174,7 @@ public void Cannot_build_graph_with_missing_related_HasOne_resource()
174174
var options = new JsonApiOptions();
175175
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
176176

177-
builder.Add<ResourceWithHasOneRelationship>();
177+
builder.Add<ResourceWithHasOneRelationship, int>();
178178

179179
// Act
180180
Action action = () => builder.Build();
@@ -191,7 +191,7 @@ public void Cannot_build_graph_with_missing_related_HasMany_resource()
191191
var options = new JsonApiOptions();
192192
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
193193

194-
builder.Add<ResourceWithHasManyRelationship>();
194+
builder.Add<ResourceWithHasManyRelationship, int>();
195195

196196
// Act
197197
Action action = () => builder.Build();
@@ -229,7 +229,7 @@ public void Logs_warning_when_adding_resource_without_attributes()
229229
var builder = new ResourceGraphBuilder(options, loggerFactory);
230230

231231
// Act
232-
builder.Add<ResourceWithHasOneRelationship>();
232+
builder.Add<ResourceWithHasOneRelationship, int>();
233233

234234
// Assert
235235
loggerFactory.Logger.Messages.ShouldHaveCount(1);
@@ -265,7 +265,7 @@ public void Resolves_correct_type_for_lazy_loading_proxy()
265265
var options = new JsonApiOptions();
266266

267267
var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
268-
builder.Add<ResourceOfInt32>();
268+
builder.Add<ResourceOfInt32, int>();
269269
IResourceGraph resourceGraph = builder.Build();
270270

271271
var proxyGenerator = new ProxyGenerator();

‎test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private static DocumentAdapter CreateDocumentAdapter<TResource>(Func<IResourceGr
247247
where TResource : Identifiable<int>
248248
{
249249
var options = new JsonApiOptions();
250-
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<TResource>().Build();
250+
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<TResource, int>().Build();
251251
options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
252252

253253
var serviceContainer = new ServiceContainer();

‎test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseModelAdapterTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,11 @@ private ResponseModelAdapter CreateAdapter(IJsonApiOptions options, string? prim
556556
// @formatter:keep_existing_linebreaks true
557557

558558
IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance)
559-
.Add<Article>()
560-
.Add<Person>()
561-
.Add<Blog>()
562-
.Add<Food>()
563-
.Add<Song>()
559+
.Add<Article, int>()
560+
.Add<Person, int>()
561+
.Add<Blog, int>()
562+
.Add<Food, int>()
563+
.Add<Song, int>()
564564
.Build();
565565

566566
// @formatter:wrap_chained_method_calls restore

0 commit comments

Comments
 (0)