Skip to content

Commit 785f3b8

Browse files
Reverted changes in JsonApiObjects and PeopleMessageFormatter
1 parent 8c9f935 commit 785f3b8

43 files changed

Lines changed: 129 additions & 129 deletions

Some content is hidden

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

src/Examples/OpenApiNSwagClientExample/PeopleMessageFormatter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private static void WritePerson(DataInPersonResponse person, ICollection<Resourc
3838
{
3939
ICollection<TodoItemIdentifierInResponse> assignedTodoItems = person.Relationships?.AssignedTodoItems?.Data ?? [];
4040

41-
builder.AppendLine($" Person {person.Id}: {person.Attributes?.DisplayName ?? string.Empty} with {assignedTodoItems.Count} assigned todo-items:");
41+
builder.AppendLine($" Person {person.Id}: {person.Attributes?.DisplayName} with {assignedTodoItems.Count} assigned todo-items:");
4242
WriteRelatedTodoItems(assignedTodoItems, includes, builder);
4343
}
4444

@@ -50,7 +50,7 @@ private static void WriteRelatedTodoItems(IEnumerable<TodoItemIdentifierInRespon
5050
DataInTodoItemResponse includedTodoItem = includes.OfType<DataInTodoItemResponse>().Single(include => include.Id == todoItemIdentifier.Id);
5151
ICollection<TagIdentifierInResponse> tags = includedTodoItem.Relationships?.Tags?.Data ?? [];
5252

53-
builder.AppendLine($" TodoItem {includedTodoItem.Id}: {includedTodoItem.Attributes?.Description ?? string.Empty} with {tags.Count} tags:");
53+
builder.AppendLine($" TodoItem {includedTodoItem.Id}: {includedTodoItem.Attributes?.Description} with {tags.Count} tags:");
5454
WriteRelatedTags(tags, includes, builder);
5555
}
5656
}
@@ -60,7 +60,7 @@ private static void WriteRelatedTags(IEnumerable<TagIdentifierInResponse> tagIde
6060
foreach (TagIdentifierInResponse tagIdentifier in tagIdentifiers)
6161
{
6262
DataInTagResponse includedTag = includes.OfType<DataInTagResponse>().Single(include => include.Id == tagIdentifier.Id);
63-
builder.AppendLine($" Tag {includedTag.Id}: {includedTag.Attributes?.Name ?? string.Empty}");
63+
builder.AppendLine($" Tag {includedTag.Id}: {includedTag.Attributes?.Name}");
6464
}
6565
}
6666
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AddToRelationshipOperation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ internal sealed class AddToRelationshipOperation<TResource> : AtomicOperation
1212
{
1313
[Required]
1414
[JsonPropertyName("op")]
15-
public required string Op { get; set; }
15+
public string Op { get; set; } = null!;
1616

1717
[Required]
1818
[JsonPropertyName("ref")]
19-
public required object Ref { get; set; }
19+
public object Ref { get; set; } = null!;
2020

2121
[Required]
2222
[JsonPropertyName("data")]
23-
public required ICollection<IdentifierInRequest<TResource>> Data { get; set; }
23+
public ICollection<IdentifierInRequest<TResource>> Data { get; set; } = null!;
2424
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AtomicOperation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
77
internal abstract class AtomicOperation : IHasMeta
88
{
99
[JsonPropertyName("meta")]
10-
public required Meta Meta { get; set; }
10+
public Meta Meta { get; set; } = null!;
1111
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/AtomicResult.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiObjects.AtomicOperations;
88
internal sealed class AtomicResult : IHasMeta
99
{
1010
[JsonPropertyName("data")]
11-
public required ResourceInResponse Data { get; set; }
11+
public ResourceInResponse Data { get; set; } = null!;
1212

1313
[JsonPropertyName("meta")]
14-
public required Meta Meta { get; set; }
14+
public Meta Meta { get; set; } = null!;
1515
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/CreateOperation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ internal sealed class CreateOperation<TResource> : AtomicOperation
1212
{
1313
[Required]
1414
[JsonPropertyName("op")]
15-
public required string Op { get; set; }
15+
public string Op { get; set; } = null!;
1616

1717
[Required]
1818
[JsonPropertyName("data")]
19-
public required DataInCreateRequest<TResource> Data { get; set; }
19+
public DataInCreateRequest<TResource> Data { get; set; } = null!;
2020
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/DeleteOperation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ internal sealed class DeleteOperation<TResource> : AtomicOperation
1212
{
1313
[Required]
1414
[JsonPropertyName("op")]
15-
public required string Op { get; set; }
15+
public string Op { get; set; } = null!;
1616

1717
[Required]
1818
[JsonPropertyName("ref")]
19-
public required IdentifierInRequest<TResource> Ref { get; set; }
19+
public IdentifierInRequest<TResource> Ref { get; set; } = null!;
2020
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/RemoveFromRelationshipOperation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ internal sealed class RemoveFromRelationshipOperation<TResource> : AtomicOperati
1212
{
1313
[Required]
1414
[JsonPropertyName("op")]
15-
public required string Op { get; set; }
15+
public string Op { get; set; } = null!;
1616

1717
[Required]
1818
[JsonPropertyName("ref")]
19-
public required object Ref { get; set; }
19+
public object Ref { get; set; } = null!;
2020

2121
[Required]
2222
[JsonPropertyName("data")]
23-
public required ICollection<IdentifierInRequest<TResource>> Data { get; set; }
23+
public ICollection<IdentifierInRequest<TResource>> Data { get; set; } = null!;
2424
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateOperation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ internal sealed class UpdateOperation<TResource> : AtomicOperation
1212
{
1313
[Required]
1414
[JsonPropertyName("op")]
15-
public required string Op { get; set; }
15+
public string Op { get; set; } = null!;
1616

1717
[JsonPropertyName("ref")]
18-
public required IdentifierInRequest<TResource> Ref { get; set; }
18+
public IdentifierInRequest<TResource> Ref { get; set; } = null!;
1919

2020
[Required]
2121
[JsonPropertyName("data")]
22-
public required DataInUpdateRequest<TResource> Data { get; set; }
22+
public DataInUpdateRequest<TResource> Data { get; set; } = null!;
2323
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateToManyRelationshipOperation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ internal sealed class UpdateToManyRelationshipOperation<TResource> : AtomicOpera
1212
{
1313
[Required]
1414
[JsonPropertyName("op")]
15-
public required string Op { get; set; }
15+
public string Op { get; set; } = null!;
1616

1717
[Required]
1818
[JsonPropertyName("ref")]
19-
public required object Ref { get; set; }
19+
public object Ref { get; set; } = null!;
2020

2121
[Required]
2222
[JsonPropertyName("data")]
23-
public required ICollection<IdentifierInRequest<TResource>> Data { get; set; }
23+
public ICollection<IdentifierInRequest<TResource>> Data { get; set; } = null!;
2424
}

src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiObjects/AtomicOperations/UpdateToOneRelationshipOperation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ internal sealed class UpdateToOneRelationshipOperation<TResource> : AtomicOperat
1212
{
1313
[Required]
1414
[JsonPropertyName("op")]
15-
public required string Op { get; set; }
15+
public string Op { get; set; } = null!;
1616

1717
[Required]
1818
[JsonPropertyName("ref")]
19-
public required object Ref { get; set; }
19+
public object Ref { get; set; } = null!;
2020

2121
[Required]
2222
[JsonPropertyName("data")]

0 commit comments

Comments
 (0)