Skip to content

Commit b8e4f38

Browse files
author
Bart Koelman
committed
Updated integration tests to use auto-generated controllers
1 parent 3c19408 commit b8e4f38

File tree

152 files changed

+125
-1128
lines changed

Some content is hidden

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

152 files changed

+125
-1128
lines changed

src/JsonApiDotNetCore.SourceGenerators/SourceCodeWriter.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ public string Write(INamedTypeSymbol resourceType, ITypeSymbol idType, JsonApiEn
6161
_sourceBuilder.Clear();
6262
_depth = 0;
6363

64+
if (idType.IsReferenceType && idType.NullableAnnotation == NullableAnnotation.Annotated)
65+
{
66+
WriteNullableEnable();
67+
}
68+
6469
WriteNamespaceImports(loggerFactoryInterface, resourceType);
6570

6671
if (controllerNamespace != null)
@@ -86,6 +91,12 @@ public string Write(INamedTypeSymbol resourceType, ITypeSymbol idType, JsonApiEn
8691
return _sourceBuilder.ToString();
8792
}
8893

94+
private void WriteNullableEnable()
95+
{
96+
_sourceBuilder.AppendLine("#nullable enable");
97+
_sourceBuilder.AppendLine();
98+
}
99+
89100
private void WriteNamespaceImports(INamedTypeSymbol loggerFactoryInterface, INamedTypeSymbol resourceType)
90101
{
91102
_sourceBuilder.AppendLine($@"using {loggerFactoryInterface.ContainingNamespace};");

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
910
public sealed class BroadcastComment : Identifiable<int>
1011
{
1112
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
88
{
99
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
10+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
1011
public sealed class TelevisionBroadcast : Identifiable<int>
1112
{
1213
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
910
public sealed class TelevisionNetwork : Identifiable<int>
1011
{
1112
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
910
public sealed class TelevisionStation : Identifiable<int>
1011
{
1112
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
910
public sealed class Lyric : Identifiable<long>
1011
{
1112
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LyricsController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
99
{
1010
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
11+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
1112
public sealed class MusicTrack : Identifiable<Guid>
1213
{
1314
[RegularExpression(@"(?im)^[{(]?[0-9A-F]{8}[-]?(?:[0-9A-F]{4}[-]?){3}[0-9A-F]{12}[)}]?$")]

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTracksController.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
910
public sealed class Performer : Identifiable<int>
1011
{
1112
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PerformersController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
88
{
99
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
10+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
1011
public sealed class Playlist : Identifiable<long>
1112
{
1213
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PlaylistsController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompaniesController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
910
public sealed class RecordCompany : Identifiable<short>
1011
{
1112
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
88
{
99
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
10+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
1011
public sealed class TextLanguage : Identifiable<Guid>
1112
{
1213
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguagesController.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
88
{
99
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
10+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys")]
1011
public sealed class Car : Identifiable<string?>
1112
{
1213
[NotMapped]

test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarsController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
77
{
88
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
9+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys")]
910
public sealed class Dealership : Identifiable<int>
1011
{
1112
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/DealershipsController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
66
{
77
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys")]
89
public sealed class Engine : Identifiable<int>
910
{
1011
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/EnginesController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PoliciesController.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation
66
{
77
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation")]
89
public sealed class Policy : Identifiable<int>
910
{
1011
[Attr]

test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults
66
{
77
[UsedImplicitly(ImplicitUseTargetFlags.Members)]
8+
[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults")]
89
public sealed class Toothbrush : Identifiable<int>
910
{
1011
[Attr]

0 commit comments

Comments
 (0)