Skip to content

Simplify null/empty string checks #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
Merged

Simplify null/empty string checks #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ private OpenApiCallback Target
/// </param>
public OpenApiCallbackReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
6 changes: 1 addition & 5 deletions src/Microsoft.OpenApi/Models/References/OpenApiExampleReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Nodes;
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Interfaces;
using Microsoft.OpenApi.Writers;

Expand Down Expand Up @@ -44,10 +43,7 @@ private OpenApiExample Target
/// </param>
public OpenApiExampleReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
8 changes: 2 additions & 6 deletions src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Nodes;
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Interfaces;
using Microsoft.OpenApi.Writers;

Expand Down Expand Up @@ -41,11 +40,8 @@ private OpenApiHeader Target
/// 2. a Url, for example: http://localhost/pet.json
/// </param>
public OpenApiHeaderReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
{
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.OpenApi/Models/References/OpenApiLinkReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ private OpenApiLink Target
/// </param>
public OpenApiLinkReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
6 changes: 1 addition & 5 deletions src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Nodes;
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Interfaces;
using Microsoft.OpenApi.Writers;

Expand Down Expand Up @@ -44,10 +43,7 @@ private OpenApiParameter Target
/// </param>
public OpenApiParameterReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ private OpenApiPathItem Target
/// </param>
public OpenApiPathItemReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.OpenApi/Models/References/OpenApiRequestBodyReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ private OpenApiRequestBody Target
/// </param>
public OpenApiRequestBodyReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ private OpenApiResponse Target
/// </param>
public OpenApiResponseReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ private OpenApiSchema Target
/// </param>
public OpenApiSchemaReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.OpenApi/Models/References/OpenApiSecuritySchemeReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ private OpenApiSecurityScheme Target
/// <param name="externalResource">The externally referenced file.</param>
public OpenApiSecuritySchemeReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ private OpenApiTag Target
/// <param name="hostDocument">The host OpenAPI document.</param>
public OpenApiTagReference(string referenceId, OpenApiDocument hostDocument)
{
if (string.IsNullOrEmpty(referenceId))
{
Utils.CheckArgumentNullOrEmpty(referenceId);
}
Utils.CheckArgumentNullOrEmpty(referenceId);

_reference = new OpenApiReference()
{
Expand Down
Loading