Skip to content

Addressing code review feedback for body top level properties rule #1810

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
fearthecowboy merged 1 commit into from
Feb 10, 2017
Merged

Addressing code review feedback for body top level properties rule #1810

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
1 change: 1 addition & 0 deletions src/modeler/AutoRest.Swagger/Model/ServiceDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public ServiceDefinition()

/// <summary>
/// Key is the object serviceTypeName and the value is swagger definition.
/// <summary>
[Rule(typeof(BooleanPropertyNotRecommended))]
[Rule(typeof(ResourceModelValidation))]
[Rule(typeof(TrackedResourceValidation))]
Expand Down
12 changes: 5 additions & 7 deletions src/modeler/AutoRest.Swagger/Validation/BooleanPropertyNotRecommended.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,20 @@ public class BooleanPropertyNotRecommended : TypedRule<Dictionary<string, Schema
/// Validates whether properties of type boolean exist.
/// </summary>
/// <param name="definitions">Operation Definition to validate</param>
/// <returns>true if there are propeties of type boolean, false otherwise.</returns>
/// <returns>true if there are no propeties of type boolean, false otherwise.</returns>
public override bool IsValid(Dictionary<string, Schema> definitions, RuleContext context, out object[] formatParameters)
{
formatParameters = null;
List<string> booleanProperties = new List<string>();
foreach (string key in definitions.Keys)
foreach (KeyValuePair<string, Schema> definition in definitions)
{
Schema definitionSchema = definitions.GetValueOrNull(key);
if (definitionSchema.Properties != null)
if (definition.Value?.Properties != null)
{
foreach (var property in definitionSchema.Properties)
foreach (KeyValuePair<string, Schema> property in definition.Value.Properties)
{
if (property.Value.Type.ToString().ToLower().Equals("boolean"))
{
booleanProperties.Add(key + "/" + property.Key);

booleanProperties.Add(definition.Key + "/" + property.Key);
}
}
}
Expand Down