Skip to content

Fix exception on null required params in new spec #109

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
Feb 15, 2018
Merged

Fix exception on null required params in new spec #109

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
10 changes: 4 additions & 6 deletions openapi-diff/src/modeler/AutoRest.Swagger/Model/Schema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public class Schema : SwaggerObject

private LinkedList<Schema> _visitedSchemas = new LinkedList<Schema>();

/// <inheritdoc />
/// <summary>
/// Compare a modified document node (this) to a previous one and look for breaking as well as non-breaking changes.
/// </summary>
Expand All @@ -74,9 +75,7 @@ public class Schema : SwaggerObject
/// <returns>A list of messages from the comparison.</returns>
public override IEnumerable<ComparisonMessage> Compare(ComparisonContext context, SwaggerBase previous)
{
var priorSchema = previous as Schema;

if (priorSchema == null)
if (!(previous is Schema priorSchema))
{
throw new ArgumentNullException("priorVersion");
}
Expand Down Expand Up @@ -178,7 +177,7 @@ public override IEnumerable<ComparisonMessage> Compare(ComparisonContext context
/// <param name="priorSchema">Schema of the old model</param>
private void CompareRequired(ComparisonContext context, Schema priorSchema)
{
if (Required == null && priorSchema.Required == null)
if (Required == null)
{
return;
}
Expand Down Expand Up @@ -232,8 +231,7 @@ private void CompareProperties(ComparisonContext context, Schema priorSchema)
{
foreach (var def in priorSchema.Properties)
{
Schema model = null;
if (Properties == null || !Properties.TryGetValue(def.Key, out model))
if (Properties == null || !Properties.TryGetValue(def.Key, out var model))
{
context.LogBreakingChange(ComparisonMessages.RemovedProperty, def.Key);
}
Expand Down
Loading