Skip to content

Commit e3325b9

Browse files
committed
fix: aligns missing properties for override
Signed-off-by: Vincent Biret <[email protected]>
1 parent 7994691 commit e3325b9

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,7 @@ public override string Description
166166
/// <inheritdoc/>
167167
public override decimal? MultipleOf { get => _multipleOf is not null ? _multipleOf : Target.MultipleOf; set => _multipleOf = value; }
168168
/// <inheritdoc/>
169-
public override JsonNode Default
170-
{
171-
get => _default ??= Target.Default; //TODO normalize like other properties
172-
set => _default = value;
173-
}
169+
public override JsonNode Default { get => _default is not null ? _default : Target.Default; set => _default = value; }
174170
/// <inheritdoc/>
175171
public override bool ReadOnly { get => _readOnly is not null ? _readOnly.Value : Target.ReadOnly; set => _readOnly = value; }
176172
/// <inheritdoc/>
@@ -182,11 +178,11 @@ public override JsonNode Default
182178
/// <inheritdoc/>
183179
public override IList<OpenApiSchema> AnyOf { get => _anyOf is not null ? _anyOf : Target?.AnyOf; set => _anyOf = value; }
184180
/// <inheritdoc/>
185-
public override OpenApiSchema Not { get => _not is not null ? _not : Target.Not; set => _not = value; }
181+
public override OpenApiSchema Not { get => _not is not null ? _not : Target?.Not; set => _not = value; }
186182
/// <inheritdoc/>
187183
public override ISet<string> Required { get => _required is not null ? _required : Target?.Required; set => _required = value; }
188184
/// <inheritdoc/>
189-
public override OpenApiSchema Items { get => _items is not null ? _items : Target.Items; set => _items = value; }
185+
public override OpenApiSchema Items { get => _items is not null ? _items : Target?.Items; set => _items = value; }
190186
/// <inheritdoc/>
191187
public override int? MaxItems { get => _maxItems is not null ? _maxItems : Target.MaxItems; set => _maxItems = value; }
192188
/// <inheritdoc/>
@@ -204,29 +200,21 @@ public override JsonNode Default
204200
/// <inheritdoc/>
205201
public override bool AdditionalPropertiesAllowed { get => _additionalPropertiesAllowed is not null ? _additionalPropertiesAllowed.Value : Target.AdditionalPropertiesAllowed; set => _additionalPropertiesAllowed = value; }
206202
/// <inheritdoc/>
207-
public override OpenApiSchema AdditionalProperties { get => _additionalProperties is not null ? _additionalProperties : Target.AdditionalProperties; set => _additionalProperties = value; }
203+
public override OpenApiSchema AdditionalProperties { get => _additionalProperties is not null ? _additionalProperties : Target?.AdditionalProperties; set => _additionalProperties = value; }
208204
/// <inheritdoc/>
209205
public override OpenApiDiscriminator Discriminator { get => _discriminator is not null ? _discriminator : Target.Discriminator; set => _discriminator = value; }
210206
/// <inheritdoc/>
211-
public override JsonNode Example
212-
{
213-
get => _example ??= Target.Example; //TODO normalize like other properties
214-
set => _example = value;
215-
}
207+
public override JsonNode Example { get => _example is not null ? _example : Target.Example; set => _example = value; }
216208
/// <inheritdoc/>
217-
public override IList<JsonNode> Examples
218-
{
219-
get => _examples ??= Target.Examples; //TODO normalize like other properties
220-
set => Target.Examples = value;
221-
}
209+
public override IList<JsonNode> Examples { get => _examples is not null ? _examples : Target?.Examples; set => _examples = value; }
222210
/// <inheritdoc/>
223211
public override IList<JsonNode> Enum { get => _enum is not null ? _enum : Target?.Enum; set => _enum = value; }
224212
/// <inheritdoc/>
225213
public override bool Nullable { get => _nullable is null ? Target.Nullable : _nullable.Value; set => _nullable = value; }
226214
/// <inheritdoc/>
227215
public override bool UnevaluatedProperties { get => _unevaluatedProperties is not null ? _unevaluatedProperties.Value : Target.UnevaluatedProperties; set => _unevaluatedProperties = value; }
228216
/// <inheritdoc/>
229-
public override OpenApiExternalDocs ExternalDocs { get => _externalDocs is not null ? _externalDocs : Target.ExternalDocs; set => _externalDocs = value; }
217+
public override OpenApiExternalDocs ExternalDocs { get => _externalDocs is not null ? _externalDocs : Target?.ExternalDocs; set => _externalDocs = value; }
230218
/// <inheritdoc/>
231219
public override bool Deprecated { get => _deprecated is not null ? _deprecated.Value : Target.Deprecated; set => _deprecated = value; }
232220
/// <inheritdoc/>

0 commit comments

Comments
 (0)