Skip to content

Commit 98afe46

Browse files
Improve naming of (Mark)NonNullableReferenceTypesAsRequired
1 parent 646ccee commit 98afe46

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/Swashbuckle.AspNetCore.SwaggerGen/DependencyInjection/ConfigureSchemaGeneratorOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private void DeepCopy(SchemaGeneratorOptions source, SchemaGeneratorOptions targ
4141
target.DiscriminatorValueSelector = source.DiscriminatorValueSelector;
4242
target.UseAllOfToExtendReferenceSchemas = source.UseAllOfToExtendReferenceSchemas;
4343
target.SupportNonNullableReferenceTypes = source.SupportNonNullableReferenceTypes;
44-
target.MarkNonNullableReferenceTypesAsRequired = source.MarkNonNullableReferenceTypesAsRequired;
44+
target.NonNullableReferenceTypesAsRequired = source.NonNullableReferenceTypesAsRequired;
4545
target.SchemaFilters = new List<ISchemaFilter>(source.SchemaFilters);
4646
}
4747

src/Swashbuckle.AspNetCore.SwaggerGen/DependencyInjection/SwaggerGenOptionsExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,9 @@ public static void SupportNonNullableReferenceTypes(this SwaggerGenOptions swagg
313313
/// Enable detection of non nullable reference types to set Required flag accordingly on schema properties
314314
/// </summary>
315315
/// <param name="swaggerGenOptions"></param>
316-
public static void MarkNonNullableReferenceTypesAsRequired(this SwaggerGenOptions swaggerGenOptions)
316+
public static void NonNullableReferenceTypesAsRequired(this SwaggerGenOptions swaggerGenOptions)
317317
{
318-
swaggerGenOptions.SchemaGeneratorOptions.MarkNonNullableReferenceTypesAsRequired = true;
318+
swaggerGenOptions.SchemaGeneratorOptions.NonNullableReferenceTypesAsRequired = true;
319319
}
320320

321321
/// <summary>

src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ private OpenApiSchema CreateObjectSchema(DataContract dataContract, SchemaReposi
396396
: GenerateSchemaForType(dataProperty.MemberType, schemaRepository);
397397

398398
var markNonNullableTypeAsRequired = (dataProperty.MemberInfo?.IsNonNullableReferenceType() ?? false)
399-
&& _generatorOptions.MarkNonNullableReferenceTypesAsRequired
399+
&& _generatorOptions.NonNullableReferenceTypesAsRequired
400400
#if !NETSTANDARD2_0
401401
&& !_mvcOptions.Value.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes
402402
#endif

src/Swashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGeneratorOptions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public SchemaGeneratorOptions()
3939

4040
public bool SupportNonNullableReferenceTypes { get; set; }
4141

42-
public bool MarkNonNullableReferenceTypesAsRequired { get; set; }
42+
public bool NonNullableReferenceTypesAsRequired { get; set; }
4343

4444
public IList<ISchemaFilter> SchemaFilters { get; set; }
4545

@@ -69,4 +69,4 @@ private string DefaultDiscriminatorValueSelector(Type subType)
6969
return null;
7070
}
7171
}
72-
}
72+
}

test/Swashbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ public void GenerateSchema_SupportsOption_MarkNonNullableReferenceTypesAsRequire
648648
bool required)
649649
{
650650
var subject = Subject(
651-
configureGenerator: c => c.MarkNonNullableReferenceTypesAsRequired = true
651+
configureGenerator: c => c.NonNullableReferenceTypesAsRequired = true
652652
);
653653
var schemaRepository = new SchemaRepository();
654654

0 commit comments

Comments
 (0)