Skip to content

Commit 457c2ba

Browse files
Refactor properties to use 'required' instead of nullable with null default
1 parent bce3e8f commit 457c2ba

162 files changed

Lines changed: 316 additions & 300 deletions

File tree

Some content is hidden

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

benchmarks/Serialization/SerializationBenchmarkBase.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,33 +88,33 @@ public sealed class OutgoingResource : Identifiable<long>
8888
public DayOfWeek Attribute10 { get; set; }
8989

9090
[HasOne]
91-
public required OutgoingResource Single1 { get; set; }
91+
public OutgoingResource Single1 { get; set; } = null!;
9292

9393
[HasOne]
94-
public required OutgoingResource Single2 { get; set; }
94+
public OutgoingResource Single2 { get; set; } = null!;
9595

9696
[HasOne]
97-
public required OutgoingResource Single3 { get; set; }
97+
public OutgoingResource Single3 { get; set; } = null!;
9898

9999
[HasOne]
100-
public required OutgoingResource Single4 { get; set; }
100+
public OutgoingResource Single4 { get; set; } = null!;
101101

102102
[HasOne]
103-
public required OutgoingResource Single5 { get; set; }
103+
public OutgoingResource Single5 { get; set; } = null!;
104104

105105
[HasMany]
106-
public required ISet<OutgoingResource> Multi1 { get; set; }
106+
public ISet<OutgoingResource> Multi1 { get; set; } = null!;
107107

108108
[HasMany]
109-
public required ISet<OutgoingResource> Multi2 { get; set; }
109+
public ISet<OutgoingResource> Multi2 { get; set; } = null!;
110110

111111
[HasMany]
112-
public required ISet<OutgoingResource> Multi3 { get; set; }
112+
public ISet<OutgoingResource> Multi3 { get; set; } = null!;
113113

114114
[HasMany]
115-
public required ISet<OutgoingResource> Multi4 { get; set; }
115+
public ISet<OutgoingResource> Multi4 { get; set; } = null!;
116116

117117
[HasMany]
118-
public required ISet<OutgoingResource> Multi5 { get; set; }
118+
public ISet<OutgoingResource> Multi5 { get; set; } = null!;
119119
}
120120
}

src/Examples/DapperExample/Models/AccountRecovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ public sealed class AccountRecovery : Identifiable<long>
1515
public string? EmailAddress { get; set; }
1616

1717
[HasOne]
18-
public required LoginAccount Account { get; set; }
18+
public LoginAccount Account { get; set; } = null!;
1919
}

src/Examples/DapperExample/Models/LoginAccount.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public sealed class LoginAccount : Identifiable<long>
1414
public DateTimeOffset? LastUsedAt { get; set; }
1515

1616
[HasOne]
17-
public required AccountRecovery Recovery { get; set; }
17+
public AccountRecovery Recovery { get; set; } = null!;
1818

1919
[HasOne]
20-
public required Person Person { get; set; }
20+
public Person Person { get; set; } = null!;
2121
}

src/Examples/DapperExample/Models/RgbColor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public override int? Id
1919
}
2020

2121
[HasOne]
22-
public required Tag Tag { get; set; }
22+
public Tag Tag { get; set; } = null!;
2323

2424
[Attr(Capabilities = AttrCapabilities.AllowView)]
2525
[NotMapped]

src/JsonApiDotNetCore.Annotations/Resources/Annotations/AttrAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public sealed class AttrAttribute : ResourceFieldAttribute
2121
/// public class Author : Identifiable<long>
2222
/// {
2323
/// [Attr(Capabilities = AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort)]
24-
/// public string Name { get; set; } = null!;
24+
/// public required string Name { get; set; }
2525
/// }
2626
/// ]]></code>
2727
/// </example>

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 string Op { get; set; } = null!;
15+
public required string Op { get; set; }
1616

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

2121
[Required]
2222
[JsonPropertyName("data")]
23-
public ICollection<IdentifierInRequest<TResource>> Data { get; set; } = null!;
23+
public required ICollection<IdentifierInRequest<TResource>> Data { get; set; }
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 Meta Meta { get; set; } = null!;
10+
public required Meta Meta { get; set; }
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 ResourceInResponse Data { get; set; } = null!;
11+
public required ResourceInResponse Data { get; set; }
1212

1313
[JsonPropertyName("meta")]
14-
public Meta Meta { get; set; } = null!;
14+
public required Meta Meta { get; set; }
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 string Op { get; set; } = null!;
15+
public required string Op { get; set; }
1616

1717
[Required]
1818
[JsonPropertyName("data")]
19-
public DataInCreateRequest<TResource> Data { get; set; } = null!;
19+
public required DataInCreateRequest<TResource> Data { get; set; }
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 string Op { get; set; } = null!;
15+
public required string Op { get; set; }
1616

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

0 commit comments

Comments
 (0)