Skip to content

Commit b15f020

Browse files
bkoelmanbkoelman
authored
Merge 3ebe52c into 5d705d6 
2 parents 5d705d6 + 3ebe52c commit b15f020

File tree

21 files changed

+18
-45
lines changed

21 files changed

+18
-45
lines changed

‎src/Examples/DatabasePerTenantExample/Controllers/EmployeesController.cs

-5
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

‎test/DiscoveryTests/PrivateResource.cs

+2
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

-5
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

-5
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

-5
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

+1
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

-5
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

+2
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

+2
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

-5
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

‎test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs

-5
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 WebShopsController
8-
{
9-
}
10-
116
[DisableRoutingConvention]
127
[Route("{countryCode}/shops")]
138
partial class WebShopsController

‎test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using System.ComponentModel.DataAnnotations;
22
using JetBrains.Annotations;
3+
using JsonApiDotNetCore.Controllers;
34
using JsonApiDotNetCore.Resources;
45
using JsonApiDotNetCore.Resources.Annotations;
56

67
namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
78

89
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
10+
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
911
public sealed class DivingBoard : Identifiable<int>
1012
{
1113
[Attr]

‎test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
using JetBrains.Annotations;
2+
using JsonApiDotNetCore.Controllers;
23
using JsonApiDotNetCore.Resources;
34
using JsonApiDotNetCore.Resources.Annotations;
45

56
namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
67

78
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
810
public sealed class SwimmingPool : Identifiable<int>
911
{
1012
[Attr]

‎test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
using JetBrains.Annotations;
2+
using JsonApiDotNetCore.Controllers;
23
using JsonApiDotNetCore.Resources;
34
using JsonApiDotNetCore.Resources.Annotations;
45

56
namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
67

78
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
810
public sealed class WaterSlide : Identifiable<int>
911
{
1012
[Attr]

‎test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
66

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

‎test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
66

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

‎test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
66

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

‎test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
66

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

‎test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs

-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
44

5-
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
6-
public partial class PillowsController
7-
{
8-
}
9-
105
[DisableQueryString("skipCache")]
116
partial class PillowsController
127
{

‎test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
66

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

‎test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs

-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
55

6-
// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
7-
public partial class SofasController
8-
{
9-
}
10-
116
[DisableQueryString(JsonApiQueryStringParameters.Sort | JsonApiQueryStringParameters.Page)]
127
partial class SofasController
138
{

0 commit comments

Comments
 (0)