Skip to content

Remove workaround for RSRP-491451 #1276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2023
Merged

Remove workaround for RSRP-491451 #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3b6262
Repro for https://youtrack.jetbrains.com/issue/RSRP-491451
bkoelman May 23, 2023
3ebe52c
Add missing controller annotations in tests
bkoelman Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/Examples/DatabasePerTenantExample/Controllers/EmployeesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

namespace DatabasePerTenantExample.Controllers;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class EmployeesController
{
}

[DisableRoutingConvention]
[Route("api/{tenantName}/employees")]
partial class EmployeesController
Expand Down
2 changes: 2 additions & 0 deletions test/DiscoveryTests/PrivateResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using JetBrains.Annotations;
using JsonApiDotNetCore.Resources;
using JsonApiDotNetCore.Resources.Annotations;

namespace DiscoveryTests;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource]
public sealed class PrivateResource : Identifiable<int>
{
}
5 changes: 0 additions & 5 deletions ...JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@

namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class ToothbrushesController
{
}

partial class ToothbrushesController
{
internal const int EmptyActionResultId = 11111111;
Expand Down
5 changes: 0 additions & 5 deletions test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class CiviliansController
{
}

[ApiController]
[DisableRoutingConvention]
[Route("world-civilians")]
Expand Down
5 changes: 0 additions & 5 deletions test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@

namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class TownsController
{
}

[DisableRoutingConvention]
[Route("world-api/civilization/popular/towns")]
partial class TownsController
Expand Down
1 change: 1 addition & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.EagerLoading")]
public sealed class City : Identifiable<int>
{
[Attr]
Expand Down
5 changes: 0 additions & 5 deletions test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class PaintingsController
{
}

[DisableRoutingConvention]
[Route("custom/path/to/paintings-of-the-world")]
partial class PaintingsController
Expand Down
2 changes: 2 additions & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using JetBrains.Annotations;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Resources.Annotations;

namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
public sealed class BankAccount : ObfuscatedIdentifiable
{
[Attr]
Expand Down
2 changes: 2 additions & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using JetBrains.Annotations;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Resources.Annotations;

namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
public sealed class DebitCard : ObfuscatedIdentifiable
{
[Attr]
Expand Down
5 changes: 0 additions & 5 deletions test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class WebProductsController
{
}

[DisableRoutingConvention]
[Route("{countryCode}/products")]
partial class WebProductsController
Expand Down
5 changes: 0 additions & 5 deletions test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class WebShopsController
{
}

[DisableRoutingConvention]
[Route("{countryCode}/shops")]
partial class WebShopsController
Expand Down
2 changes: 2 additions & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
using System.ComponentModel.DataAnnotations;
using JetBrains.Annotations;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Resources;
using JsonApiDotNetCore.Resources.Annotations;

namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
public sealed class DivingBoard : Identifiable<int>
{
[Attr]
Expand Down
2 changes: 2 additions & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using JetBrains.Annotations;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Resources;
using JsonApiDotNetCore.Resources.Annotations;

namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
public sealed class SwimmingPool : Identifiable<int>
{
[Attr]
Expand Down
2 changes: 2 additions & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using JetBrains.Annotations;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Resources;
using JsonApiDotNetCore.Resources.Annotations;

namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
public sealed class WaterSlide : Identifiable<int>
{
[Attr]
Expand Down
1 change: 1 addition & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
public sealed class AccountPreferences : Identifiable<int>
{
[Attr]
Expand Down
1 change: 1 addition & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
public sealed class Appointment : Identifiable<int>
{
[Attr]
Expand Down
1 change: 1 addition & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
public sealed class Label : Identifiable<int>
{
[Attr]
Expand Down
1 change: 1 addition & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
public sealed class LoginAttempt : Identifiable<int>
{
[Attr]
Expand Down
5 changes: 0 additions & 5 deletions test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class PillowsController
{
}

[DisableQueryString("skipCache")]
partial class PillowsController
{
Expand Down
1 change: 1 addition & 0 deletions test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;

[UsedImplicitly(ImplicitUseTargetFlags.Members)]
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers")]
public sealed class Room : Identifiable<int>
{
[Attr]
Expand Down
5 changes: 0 additions & 5 deletions test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;

// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
public partial class SofasController
{
}

[DisableQueryString(JsonApiQueryStringParameters.Sort | JsonApiQueryStringParameters.Page)]
partial class SofasController
{
Expand Down