Skip to content

Commit 210b0dd

Browse files
authored
Merge pull request #1276 from json-api-dotnet/repro-for-RSRP-491451
Remove workaround for RSRP-491451
2 parents 5d705d6 + 3ebe52c commit 210b0dd

File tree

21 files changed

+18
-45
lines changed

21 files changed

+18
-45
lines changed

src/Examples/DatabasePerTenantExample/Controllers/EmployeesController.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
namespace DatabasePerTenantExample.Controllers;
55

6-
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
7-
public partial class EmployeesController
8-
{
9-
}
10-
116
[DisableRoutingConvention]
127
[Route("api/{tenantName}/employees")]
138
partial class EmployeesController
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using JetBrains.Annotations;
22
using JsonApiDotNetCore.Resources;
3+
using JsonApiDotNetCore.Resources.Annotations;
34

45
namespace DiscoveryTests;
56

67
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource]
79
public sealed class PrivateResource : Identifiable<int>
810
{
911
}

test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults;
66

7-
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
8-
public partial class ToothbrushesController
9-
{
10-
}
11-
127
partial class ToothbrushesController
138
{
149
internal const int EmptyActionResultId = 11111111;

test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
55

6-
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
7-
public partial class CiviliansController
8-
{
9-
}
10-
116
[ApiController]
127
[DisableRoutingConvention]
138
[Route("world-civilians")]

test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88

99
namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
1010

11-
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
12-
public partial class TownsController
13-
{
14-
}
15-
1611
[DisableRoutingConvention]
1712
[Route("world-api/civilization/popular/towns")]
1813
partial class TownsController

test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
66

77
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.EagerLoading")]
89
public sealed class City : Identifiable<int>
910
{
1011
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
55

6-
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
7-
public partial class PaintingsController
8-
{
9-
}
10-
116
[DisableRoutingConvention]
127
[Route("custom/path/to/paintings-of-the-world")]
138
partial class PaintingsController

test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using JetBrains.Annotations;
2+
using JsonApiDotNetCore.Controllers;
23
using JsonApiDotNetCore.Resources.Annotations;
34

45
namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
56

67
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
79
public sealed class BankAccount : ObfuscatedIdentifiable
810
{
911
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using JetBrains.Annotations;
2+
using JsonApiDotNetCore.Controllers;
23
using JsonApiDotNetCore.Resources.Annotations;
34

45
namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
56

67
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
79
public sealed class DebitCard : ObfuscatedIdentifiable
810
{
911
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
55

6-
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
7-
public partial class WebProductsController
8-
{
9-
}
10-
116
[DisableRoutingConvention]
127
[Route("{countryCode}/products")]
138
partial class WebProductsController

0 commit comments

Comments
 (0)