more explicit json, start of support for Continuation Token

Author: pwelter34

src/MediatR.CommandQuery.Audit/AuditRecord.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
 
 using EntityChange;
 
@@ -16,14 +17,17 @@ public class AuditRecord<TKey>
     /// <value>
     /// The key for the entity.
     /// </value>
-    [NotNull] public TKey Key { get; set; } = default!;
+    [NotNull]
+    [JsonPropertyName("key")]
+    public TKey Key { get; set; } = default!;
 
     /// <summary>
     /// Gets or sets the entity name.
     /// </summary>
     /// <value>
     /// The entity name.
     /// </value>
+    [JsonPropertyName("entity")]
     public string Entity { get; set; } = null!;
 
     /// <summary>
@@ -32,6 +36,8 @@ public class AuditRecord<TKey>
     /// <value>
     /// The entity display name.
     /// </value>
+    [JsonPropertyName("displayName")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? DisplayName { get; set; }
 
     /// <summary>
@@ -40,22 +46,27 @@ public class AuditRecord<TKey>
     /// <value>
     /// The description of the entity.
     /// </value>
+    [JsonPropertyName("description")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Description { get; set; }
 
     /// <summary>
-    /// Gets or sets the date the change activity occured.
+    /// Gets or sets the date the change activity occurred.
     /// </summary>
     /// <value>
-    /// The date the change activity occured.
+    /// The date the change activity occurred.
     /// </value>
+    [JsonPropertyName("activityDate")]
     public DateTimeOffset ActivityDate { get; set; }
 
     /// <summary>
-    /// Gets or sets the username that initiated the activity.
+    /// Gets or sets the user name that initiated the activity.
     /// </summary>
     /// <value>
-    /// The username that initiated the activity.
+    /// The user name that initiated the activity.
     /// </value>
+    [JsonPropertyName("activityBy")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? ActivityBy { get; set; }
 
     /// <summary>
@@ -64,6 +75,8 @@ public class AuditRecord<TKey>
     /// <value>
     /// The type of operation.
     /// </value>
+    [JsonPropertyName("operation")]
+    [JsonConverter(typeof(JsonStringEnumConverter<AuditOperation>))]
     public AuditOperation Operation { get; set; }
 
     /// <summary>
@@ -72,6 +85,7 @@ public class AuditRecord<TKey>
     /// <value>
     /// The list of changes.
     /// </value>
+    [JsonPropertyName("changes")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public IReadOnlyCollection<ChangeRecord>? Changes { get; set; }
-
 }

src/MediatR.CommandQuery/Commands/EntityIdentifierCommand.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
+using System.Text.Json.Serialization;
 
 namespace MediatR.CommandQuery.Commands;
 
@@ -32,5 +33,6 @@ protected EntityIdentifierCommand(ClaimsPrincipal? principal, [NotNull] TKey id)
     /// The identifier for this command.
     /// </value>
     [NotNull]
+    [JsonPropertyName("id")]
     public TKey Id { get; }
 }

src/MediatR.CommandQuery/Commands/EntityIdentifiersCommand.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
+using System.Text.Json.Serialization;
 
 namespace MediatR.CommandQuery.Commands;
 
@@ -31,5 +32,6 @@ protected EntityIdentifiersCommand(ClaimsPrincipal? principal, [NotNull] IReadOn
     /// <value>
     /// The list of identifiers for this command.
     /// </value>
+    [JsonPropertyName("ids")]
     public IReadOnlyCollection<TKey> Ids { get; }
 }

src/MediatR.CommandQuery/Commands/EntityModelCommand.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
+using System.Text.Json.Serialization;
 
 namespace MediatR.CommandQuery.Commands;
 
@@ -34,5 +35,6 @@ protected EntityModelCommand(ClaimsPrincipal? principal, [NotNull] TEntityModel
     /// The view model to use for this command.
     /// </value>
     [NotNull]
+    [JsonPropertyName("model")]
     public TEntityModel Model { get; }
 }

src/MediatR.CommandQuery/Commands/EntityPatchCommand.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
+using System.Text.Json.Serialization;
 
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Services;
@@ -38,6 +39,7 @@ public EntityPatchCommand(ClaimsPrincipal? principal, [NotNull] TKey id, [NotNul
     /// <value>
     /// The patch.
     /// </value>
+    [JsonPropertyName("patch")]
     public JsonPatchDocument Patch { get; }
 
     /// <inheritdoc />

src/MediatR.CommandQuery/Commands/EntityUpdateCommand.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
+using System.Text.Json.Serialization;
 
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Services;
@@ -36,6 +37,7 @@ public EntityUpdateCommand(ClaimsPrincipal? principal, [NotNull] TKey id, TUpdat
     /// The identifier for entity to update.
     /// </value>
     [NotNull]
+    [JsonPropertyName("id")]
     public TKey Id { get; }
 
     /// <inheritdoc />

src/MediatR.CommandQuery/Commands/EntityUpsertCommand.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
+using System.Text.Json.Serialization;
 
 using MediatR.CommandQuery.Definitions;
 using MediatR.CommandQuery.Services;
@@ -36,6 +37,7 @@ public EntityUpsertCommand(ClaimsPrincipal? principal, [NotNull] TKey id, TUpdat
     /// The identifier for entity to update.
     /// </value>
     [NotNull]
+    [JsonPropertyName("id")]
     public TKey Id { get; }
 
     /// <inheritdoc />

src/MediatR.CommandQuery/Commands/PrincipalCommandBase.cs

@@ -31,7 +31,9 @@ protected PrincipalCommandBase(ClaimsPrincipal? principal)
     /// <value>
     /// The <see cref="ClaimsPrincipal"/> this command is run for.
     /// </value>
+    [JsonPropertyName("principal")]
     [JsonConverter(typeof(ClaimsPrincipalConverter))]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public ClaimsPrincipal? Principal { get; }
 
     /// <summary>

src/MediatR.CommandQuery/MediatorJsonContext.cs

@@ -5,10 +5,6 @@
 
 namespace MediatR.CommandQuery;
 
-[JsonSourceGenerationOptions(
-    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase
-)]
 [JsonSerializable(typeof(DispatchRequest))]
 [JsonSerializable(typeof(ProblemDetails))]
 public partial class MediatorJsonContext : JsonSerializerContext;

src/MediatR.CommandQuery/Models/CompleteModel.cs

@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 namespace MediatR.CommandQuery.Models;
 
 /// <summary>
@@ -11,6 +13,7 @@ public class CompleteModel
     /// <value>
     ///   <c>true</c> if was successful; otherwise, <c>false</c>.
     /// </value>
+    [JsonPropertyName("successful")]
     public bool Successful { get; set; }
 
     /// <summary>
@@ -19,6 +22,8 @@ public class CompleteModel
     /// <value>
     /// The operation result message.
     /// </value>
+    [JsonPropertyName("message")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Message { get; set; }
 
     /// <summary>