Skip to content

Commit 576cde9

Browse files
Refactor Identifiable base class to use long instead of int for ID types across various resource models and tests
1 parent 233d8ec commit 576cde9

File tree

118 files changed

+198
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+198
-198
lines changed

test/DiscoveryTests/LoggingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public async Task Logs_message_to_add_NuGet_reference()
3232
var resourceGraph = app.Services.GetRequiredService<IResourceGraph>();
3333
ResourceType resourceType = resourceGraph.GetResourceType<PrivateResource>();
3434

35-
var repository = app.Services.GetRequiredService<IResourceRepository<PrivateResource, int>>();
35+
var repository = app.Services.GetRequiredService<IResourceRepository<PrivateResource, long>>();
3636

3737
// Act
3838
_ = await repository.GetAsync(new QueryLayer(resourceType), CancellationToken.None);

test/DiscoveryTests/PrivateResource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ namespace DiscoveryTests;
66

77
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
88
[Resource]
9-
public sealed class PrivateResource : Identifiable<int>;
9+
public sealed class PrivateResource : Identifiable<long>;

test/DiscoveryTests/PrivateResourceDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ namespace DiscoveryTests;
66

77
[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
88
public sealed class PrivateResourceDefinition(IResourceGraph resourceGraph)
9-
: JsonApiResourceDefinition<PrivateResource, int>(resourceGraph);
9+
: JsonApiResourceDefinition<PrivateResource, long>(resourceGraph);

test/DiscoveryTests/PrivateResourceRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ namespace DiscoveryTests;
1111
public sealed class PrivateResourceRepository(
1212
ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph, IResourceFactory resourceFactory,
1313
IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory, IResourceDefinitionAccessor resourceDefinitionAccessor)
14-
: EntityFrameworkCoreRepository<PrivateResource, int>(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory,
14+
: EntityFrameworkCoreRepository<PrivateResource, long>(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory,
1515
resourceDefinitionAccessor);

test/DiscoveryTests/PrivateResourceService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ public sealed class PrivateResourceService(
1414
IResourceRepositoryAccessor repositoryAccessor, IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext, IJsonApiOptions options,
1515
ILoggerFactory loggerFactory, IJsonApiRequest request, IResourceChangeTracker<PrivateResource> resourceChangeTracker,
1616
IResourceDefinitionAccessor resourceDefinitionAccessor)
17-
: JsonApiResourceService<PrivateResource, int>(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request,
17+
: JsonApiResourceService<PrivateResource, long>(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request,
1818
resourceChangeTracker, resourceDefinitionAccessor);

test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void Can_add_resource_service_from_current_assembly_to_container()
7070

7171
// Assert
7272
ServiceProvider serviceProvider = _services.BuildServiceProvider();
73-
var resourceService = serviceProvider.GetRequiredService<IResourceService<PrivateResource, int>>();
73+
var resourceService = serviceProvider.GetRequiredService<IResourceService<PrivateResource, long>>();
7474

7575
resourceService.Should().BeOfType<PrivateResourceService>();
7676
}
@@ -86,7 +86,7 @@ public void Can_add_resource_repository_from_current_assembly_to_container()
8686

8787
// Assert
8888
ServiceProvider serviceProvider = _services.BuildServiceProvider();
89-
var resourceRepository = serviceProvider.GetRequiredService<IResourceRepository<PrivateResource, int>>();
89+
var resourceRepository = serviceProvider.GetRequiredService<IResourceRepository<PrivateResource, long>>();
9090

9191
resourceRepository.Should().BeOfType<PrivateResourceRepository>();
9292
}
@@ -102,7 +102,7 @@ public void Can_add_resource_definition_from_current_assembly_to_container()
102102

103103
// Assert
104104
ServiceProvider serviceProvider = _services.BuildServiceProvider();
105-
var resourceDefinition = serviceProvider.GetRequiredService<IResourceDefinition<PrivateResource, int>>();
105+
var resourceDefinition = serviceProvider.GetRequiredService<IResourceDefinition<PrivateResource, long>>();
106106

107107
resourceDefinition.Should().BeOfType<PrivateResourceDefinition>();
108108
}

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
66

77
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
88
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
9-
public sealed class BroadcastComment : Identifiable<int>
9+
public sealed class BroadcastComment : Identifiable<long>
1010
{
1111
[Attr]
1212
public string Text { get; set; } = null!;

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
66

77
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
88
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
9-
public sealed class TelevisionBroadcast : Identifiable<int>
9+
public sealed class TelevisionBroadcast : Identifiable<long>
1010
{
1111
[Attr]
1212
public string Title { get; set; } = null!;

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
1515
[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
1616
public sealed class TelevisionBroadcastDefinition(
1717
IResourceGraph resourceGraph, TelevisionDbContext dbContext, IJsonApiRequest request, IEnumerable<IQueryConstraintProvider> constraintProviders)
18-
: JsonApiResourceDefinition<TelevisionBroadcast, int>(resourceGraph)
18+
: JsonApiResourceDefinition<TelevisionBroadcast, long>(resourceGraph)
1919
{
2020
private readonly TelevisionDbContext _dbContext = dbContext;
2121
private readonly IJsonApiRequest _request = request;

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
66

77
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
88
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
9-
public sealed class TelevisionNetwork : Identifiable<int>
9+
public sealed class TelevisionNetwork : Identifiable<long>
1010
{
1111
[Attr]
1212
public string Name { get; set; } = null!;

0 commit comments

Comments
 (0)