Fix cibuild: remove controllers namespace

Bart Koelman · Bart Koelman · commit b0e733d6685b · 2022-03-17T11:52:11.000+01:00
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/BicycleLight.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/BicycleLight.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class BicycleLight : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Bike.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Bike.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public class Bike : Vehicle
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Box.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Box.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class Box : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Car.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Car.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class Car : MotorVehicle
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/CarbonWheel.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/CarbonWheel.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class CarbonWheel : Wheel
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/ChromeWheel.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/ChromeWheel.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class ChromeWheel : Wheel
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Cylinder.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Cylinder.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class Cylinder : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/DieselEngine.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/DieselEngine.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class DieselEngine : Engine
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Engine.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Engine.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public abstract class Engine : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/GasolineEngine.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/GasolineEngine.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class GasolineEngine : Engine
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/GenericFeature.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/GenericFeature.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class GenericFeature : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/GenericProperty.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/GenericProperty.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public abstract class GenericProperty : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/MotorVehicle.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/MotorVehicle.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public abstract class MotorVehicle : Vehicle
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/NavigationSystem.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/NavigationSystem.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class NavigationSystem : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/NumberProperty.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/NumberProperty.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class NumberProperty : GenericProperty
 {
     [HasOne]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/NumberValue.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/NumberValue.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class NumberValue : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/StringProperty.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/StringProperty.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class StringProperty : GenericProperty
 {
     [HasOne]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/StringValue.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/StringValue.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class StringValue : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Tandem.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Tandem.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class Tandem : Bike
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Truck.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Truck.cs
@@ -4,7 +4,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class Truck : MotorVehicle
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Vehicle.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Vehicle.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public abstract class Vehicle : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/VehicleManufacturer.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/VehicleManufacturer.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public sealed class VehicleManufacturer : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Wheel.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Wheel.cs
@@ -5,7 +5,7 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
 public abstract class Wheel : Identifiable<long>
 {
     [Attr]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceTests.cs
@@ -3,7 +3,6 @@
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
-using JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers;
 using JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;
 using Microsoft.Extensions.DependencyInjection;
 using TestBuildingBlocks;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;`
`6`	`6`
`7`	`7`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
`8`		`-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]`
	`8`	`+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]`
`9`	`9`	`public sealed class BicycleLight : Identifiable<long>`
`10`	`10`	`{`
`11`	`11`	`[Attr]`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models;`
`5`	`5`
`6`	`6`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
`7`		`-[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Controllers")]`
	`7`	`+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]`
`8`	`8`	`public class Bike : Vehicle`
`9`	`9`	`{`
`10`	`10`	`[Attr]`