From 48f1173adad3b1b91f5bf484095ef7f27070095a Mon Sep 17 00:00:00 2001 From: Sarangan Rajamanickam Date: Tue, 31 Jan 2017 00:03:51 -0800 Subject: [PATCH 1/7] Code changes to generate resources/subresources --- .../AutoRest.Ruby.Azure/CodeGeneratorRba.cs | 10 +-- .../Model/CompositeTypeRba.cs | 44 +++++++++++- .../Model/RequirementsRba.cs | 4 +- .../Templates/AzureModelTemplate.cshtml | 69 +++++++++++++++++++ 4 files changed, 121 insertions(+), 6 deletions(-) create mode 100644 src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml diff --git a/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs b/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs index 9b1505e0fa..a2a9b397b5 100644 --- a/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs @@ -61,8 +61,7 @@ public override async Task Generate(CodeModel cm) foreach (CompositeTypeRba model in codeModel.ModelTypes) { if ((model.Extensions.ContainsKey(AzureExtensions.ExternalExtension) && - (bool)model.Extensions[AzureExtensions.ExternalExtension]) - || model.Name == "Resource" || model.Name == "SubResource") + (bool)model.Extensions[AzureExtensions.ExternalExtension])) { continue; } @@ -73,8 +72,11 @@ public override async Task Generate(CodeModel cm) continue; } - var modelTemplate = new ModelTemplate { Model = model }; - await Write(modelTemplate, Path.Combine(GeneratorSettingsRb.Instance.modelsPath, CodeNamer.UnderscoreCase(model.Name) + ImplementationFileExtension)); + var modelTemplate = new AzureModelTemplate { Model = model }; + if(!CompositeTypeRba.nameRegEx.IsMatch(model.Name.ToString()) || !CompositeTypeRba.IsResourceModelsMatchStandardDefinition(model)) + { + await Write(modelTemplate, Path.Combine(GeneratorSettingsRb.Instance.modelsPath, CodeNamer.UnderscoreCase(model.Name) + ImplementationFileExtension)); + } } // Paged Models foreach (var pageModel in codeModel.pageModels) diff --git a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs index 6b49fd0b5e..44d9f9c75c 100644 --- a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs @@ -1,9 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See License.txt in the project root for license information. +using System; +using System.Linq; using System.Collections.Generic; using AutoRest.Extensions.Azure; using AutoRest.Ruby.Model; +using AutoRest.Core.Model; +using System.Text.RegularExpressions; namespace AutoRest.Ruby.Azure.Model { @@ -12,6 +16,10 @@ namespace AutoRest.Ruby.Azure.Model /// public class CompositeTypeRba : CompositeTypeRb { + public static readonly Regex nameRegEx = new Regex(@"^(RESOURCE|SUBRESOURCE)$", RegexOptions.IgnoreCase); + private static readonly Regex subResourceRegEx = new Regex(@"^(ID)$", RegexOptions.IgnoreCase); + private static readonly Regex resourceRegEx = new Regex(@"^(ID|NAME|TYPE|LOCATION|TAGS)$", RegexOptions.IgnoreCase); + /// /// Initializes a new instance of the AzureModelTemplateModel class. /// @@ -42,15 +50,49 @@ public override string GetBaseTypeName() if (this.BaseModelType.Extensions.ContainsKey(AzureExtensions.ExternalExtension) || this.BaseModelType.Extensions.ContainsKey(AzureExtensions.AzureResourceExtension)) { - typeName = "MsRestAzure::" + typeName; + if(!nameRegEx.IsMatch(typeName) || !IsResourceModelsMatchStandardDefinition(this)) + { + typeName = "MsRestAzure::" + typeName; + } } return " < " + typeName; } + else if (nameRegEx.IsMatch(this.Name.ToString())) + { + return " < " + "MsRestAzure::" + this.Name.ToString(); + } return string.Empty; } + public static bool IsResourceModelsMatchStandardDefinition(CompositeType model) + { + string modelName = model.Name.ToString(); + if ( + (modelName.Equals("SubResource", StringComparison.InvariantCultureIgnoreCase) && + model.Properties.All(property => subResourceRegEx.IsMatch(property.Name.ToString()))) || + (modelName.Equals("Resource", StringComparison.InvariantCultureIgnoreCase) && + model.Properties.All(property => resourceRegEx.IsMatch(property.Name.ToString()))) + ) + { + return true; + } + return false; + } + + public static bool ShouldAccessorGenerated(CompositeType model, string propertyName) + { + string modelName = model.Name.ToString(); + if((modelName.Equals("SubResource", StringComparison.InvariantCultureIgnoreCase) && subResourceRegEx.IsMatch(propertyName)) || + (modelName.Equals("Resource", StringComparison.InvariantCultureIgnoreCase) && resourceRegEx.IsMatch(propertyName))) + { + return false; + } + return true; + } + + /// /// Gets the list of modules/classes which need to be included. /// diff --git a/src/generator/AutoRest.Ruby.Azure/Model/RequirementsRba.cs b/src/generator/AutoRest.Ruby.Azure/Model/RequirementsRba.cs index f01be6ef22..728925e955 100644 --- a/src/generator/AutoRest.Ruby.Azure/Model/RequirementsRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/Model/RequirementsRba.cs @@ -2,6 +2,8 @@ // Licensed under the MIT License. See License.txt in the project root for license information. using System; +using System.Linq; +using System.Text.RegularExpressions; using AutoRest.Core.Model; using AutoRest.Extensions.Azure; using AutoRest.Ruby.Model; @@ -22,7 +24,7 @@ protected override bool ExcludeModel(CompositeType model) { return (model.Extensions.ContainsKey(AzureExtensions.ExternalExtension) && (bool) model.Extensions[AzureExtensions.ExternalExtension]) - || model.Name == "Resource" || model.Name == "SubResource"; + ||CompositeTypeRba.IsResourceModelsMatchStandardDefinition(model); } /// diff --git a/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml b/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml new file mode 100644 index 0000000000..c4b52fbded --- /dev/null +++ b/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml @@ -0,0 +1,69 @@ +@using System +@using System.Linq +@using AutoRest.Core.Utilities +@using AutoRest.Ruby +@using AutoRest.Ruby.Model +@using AutoRest.Ruby.Azure.Model +@inherits AutoRest.Core.Template +# encoding: utf-8 +@Header("# ") +@EmptyLine +module @(Settings.Namespace) + module Models + # + @WrapComment("# ", Model.BuildSummaryAndDescriptionString()) + # + class @Model.Name@(Model.GetBaseTypeName()) + @if (Model.Includes.Any()) + { + @EmptyLine + foreach (var include in Model.Includes) + { + @:include @include + } + @EmptyLine + } + + @if (Model.BaseIsPolymorphic && Model.BaseModelType == null) + { + @:@@@@discriminatorMap = Hash.new + foreach (var derivedType in Model.DerivedTypes) + { + @:@@@@discriminatorMap["@derivedType.SerializedName"] = "@derivedType.Name" + } + } + + @if (Model.BaseIsPolymorphic) + { + @EmptyLine + @:def initialize + @: @@@Model.PolymorphicDiscriminatorProperty.Name = "@Model.SerializedName" + @:end + @EmptyLine + @:attr_accessor :@Model.PolymorphicDiscriminatorProperty.Name + @EmptyLine + } + + @foreach (var property in Model.PropertyTemplateModels.Where( each => !each.IsPolymorphicDiscriminator)) + { + @if (CompositeTypeRba.ShouldAccessorGenerated(Model, property.Name)) + { + @:@WrapComment("# ", string.Format("@return {0}{1}", property.ModelType.GetYardDocumentation(), CompositeTypeRb.GetPropertyDocumentationString(property))) + // @:@(property.IsReadOnly ? "attr_reader" : "attr_accessor") :@property.Name + @:attr_accessor :@property.Name + @EmptyLine + @: + } + } + + @EmptyLine + # + @WrapComment("# ", string.Format("Mapper for {0} class as Ruby Hash.", Model.Name)) + # This will be used for serialization/deserialization. + # + def self.mapper() + @(Model.ConstructModelMapper()) + end + end + end +end From 4b7d7d7869dab6cc6cf73133bd229f5521ec1870 Mon Sep 17 00:00:00 2001 From: Sarangan Rajamanickam Date: Tue, 31 Jan 2017 00:30:30 -0800 Subject: [PATCH 2/7] Fix spaces --- .../Templates/AzureModelTemplate.cshtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml b/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml index c4b52fbded..1a3c16b897 100644 --- a/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml +++ b/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml @@ -48,11 +48,11 @@ module @(Settings.Namespace) { @if (CompositeTypeRba.ShouldAccessorGenerated(Model, property.Name)) { - @:@WrapComment("# ", string.Format("@return {0}{1}", property.ModelType.GetYardDocumentation(), CompositeTypeRb.GetPropertyDocumentationString(property))) - // @:@(property.IsReadOnly ? "attr_reader" : "attr_accessor") :@property.Name - @:attr_accessor :@property.Name - @EmptyLine - @: + @:@WrapComment("# ", string.Format("@return {0}{1}", property.ModelType.GetYardDocumentation(), CompositeTypeRb.GetPropertyDocumentationString(property))) + // @:@(property.IsReadOnly ? "attr_reader" : "attr_accessor") :@property.Name + @:attr_accessor :@property.Name + @EmptyLine + @: } } From 9e3e93bfced5585905cc7803342f470a3cbf2da1 Mon Sep 17 00:00:00 2001 From: Sarangan Rajamanickam Date: Wed, 1 Feb 2017 10:13:32 -0800 Subject: [PATCH 3/7] Response to PR Comments --- .../AutoRest.Ruby.Azure/CodeGeneratorRba.cs | 4 +- .../Model/CompositeTypeRba.cs | 45 +++++++++++++------ .../Model/RequirementsRba.cs | 4 +- .../Templates/AzureModelTemplate.cshtml | 5 +-- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs b/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs index a2a9b397b5..ca57e6e87e 100644 --- a/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs @@ -66,14 +66,14 @@ public override async Task Generate(CodeModel cm) continue; } - if( codeModel.pageModels.Any( each => each.Name.EqualsIgnoreCase(model.Name ) ) ) + if ( codeModel.pageModels.Any( each => each.Name.EqualsIgnoreCase(model.Name ) ) ) { // Skip, handled in the .pageModels section below. continue; } var modelTemplate = new AzureModelTemplate { Model = model }; - if(!CompositeTypeRba.nameRegEx.IsMatch(model.Name.ToString()) || !CompositeTypeRba.IsResourceModelsMatchStandardDefinition(model)) + if (!CompositeTypeRba.resourceOrSubResourceRegEx.IsMatch(model.Name.ToString()) || !CompositeTypeRba.IsResourceModelMatchingStandardDefinition(model)) { await Write(modelTemplate, Path.Combine(GeneratorSettingsRb.Instance.modelsPath, CodeNamer.UnderscoreCase(model.Name) + ImplementationFileExtension)); } diff --git a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs index 44d9f9c75c..009df47f28 100644 --- a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs @@ -16,9 +16,9 @@ namespace AutoRest.Ruby.Azure.Model /// public class CompositeTypeRba : CompositeTypeRb { - public static readonly Regex nameRegEx = new Regex(@"^(RESOURCE|SUBRESOURCE)$", RegexOptions.IgnoreCase); - private static readonly Regex subResourceRegEx = new Regex(@"^(ID)$", RegexOptions.IgnoreCase); - private static readonly Regex resourceRegEx = new Regex(@"^(ID|NAME|TYPE|LOCATION|TAGS)$", RegexOptions.IgnoreCase); + public static readonly Regex resourceOrSubResourceRegEx = new Regex(@"^(RESOURCE|SUBRESOURCE)$", RegexOptions.IgnoreCase); + private static readonly Regex subResourceRegEx = new Regex(@"^(ID)$", RegexOptions.IgnoreCase); + private static readonly Regex resourceRegEx = new Regex(@"^(ID|NAME|TYPE|LOCATION|TAGS)$", RegexOptions.IgnoreCase); /// /// Initializes a new instance of the AzureModelTemplateModel class. @@ -50,7 +50,7 @@ public override string GetBaseTypeName() if (this.BaseModelType.Extensions.ContainsKey(AzureExtensions.ExternalExtension) || this.BaseModelType.Extensions.ContainsKey(AzureExtensions.AzureResourceExtension)) { - if(!nameRegEx.IsMatch(typeName) || !IsResourceModelsMatchStandardDefinition(this)) + if (!resourceOrSubResourceRegEx.IsMatch(typeName) || !IsResourceModelMatchingStandardDefinition(this)) { typeName = "MsRestAzure::" + typeName; } @@ -58,30 +58,46 @@ public override string GetBaseTypeName() return " < " + typeName; } - else if (nameRegEx.IsMatch(this.Name.ToString())) + else if (resourceOrSubResourceRegEx.IsMatch(this.Name)) { - return " < " + "MsRestAzure::" + this.Name.ToString(); + return " < " + "MsRestAzure::" + this.Name; } return string.Empty; } - public static bool IsResourceModelsMatchStandardDefinition(CompositeType model) + /// + /// Checks if the provided definition of models 'Resource'/'SubResource' matches the standard definition. + /// For other models, it returns false. + /// + /// to be validated + /// + public static bool IsResourceModelMatchingStandardDefinition(CompositeType model) { string modelName = model.Name.ToString(); - if ( - (modelName.Equals("SubResource", StringComparison.InvariantCultureIgnoreCase) && - model.Properties.All(property => subResourceRegEx.IsMatch(property.Name.ToString()))) || - (modelName.Equals("Resource", StringComparison.InvariantCultureIgnoreCase) && - model.Properties.All(property => resourceRegEx.IsMatch(property.Name.ToString()))) - ) + if (modelName.Equals("SubResource", StringComparison.InvariantCultureIgnoreCase) && + model.Properties.All(property => subResourceRegEx.IsMatch(property.Name.ToString()))) + { + return true; + } + + if(modelName.Equals("Resource", StringComparison.InvariantCultureIgnoreCase) && + model.Properties.All(property => resourceRegEx.IsMatch(property.Name.ToString()))) { return true; } + return false; } - public static bool ShouldAccessorGenerated(CompositeType model, string propertyName) + /// + /// Determines if the accessor needs to be generated. For Resource/SubResource models, accessors are generated only + /// for properties that are not in the standard definition. + /// + /// + /// + /// + public static bool NeedsAccessor(CompositeType model, string propertyName) { string modelName = model.Name.ToString(); if((modelName.Equals("SubResource", StringComparison.InvariantCultureIgnoreCase) && subResourceRegEx.IsMatch(propertyName)) || @@ -89,6 +105,7 @@ public static bool ShouldAccessorGenerated(CompositeType model, string propertyN { return false; } + return true; } diff --git a/src/generator/AutoRest.Ruby.Azure/Model/RequirementsRba.cs b/src/generator/AutoRest.Ruby.Azure/Model/RequirementsRba.cs index 728925e955..159bed280e 100644 --- a/src/generator/AutoRest.Ruby.Azure/Model/RequirementsRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/Model/RequirementsRba.cs @@ -2,8 +2,6 @@ // Licensed under the MIT License. See License.txt in the project root for license information. using System; -using System.Linq; -using System.Text.RegularExpressions; using AutoRest.Core.Model; using AutoRest.Extensions.Azure; using AutoRest.Ruby.Model; @@ -24,7 +22,7 @@ protected override bool ExcludeModel(CompositeType model) { return (model.Extensions.ContainsKey(AzureExtensions.ExternalExtension) && (bool) model.Extensions[AzureExtensions.ExternalExtension]) - ||CompositeTypeRba.IsResourceModelsMatchStandardDefinition(model); + ||CompositeTypeRba.IsResourceModelMatchingStandardDefinition(model); } /// diff --git a/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml b/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml index 1a3c16b897..263626e01a 100644 --- a/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml +++ b/src/generator/AutoRest.Ruby.Azure/Templates/AzureModelTemplate.cshtml @@ -44,12 +44,11 @@ module @(Settings.Namespace) @EmptyLine } - @foreach (var property in Model.PropertyTemplateModels.Where( each => !each.IsPolymorphicDiscriminator)) + @foreach (var property in Model.PropertyTemplateModels.Where(each => !each.IsPolymorphicDiscriminator)) { - @if (CompositeTypeRba.ShouldAccessorGenerated(Model, property.Name)) + @if (CompositeTypeRba.NeedsAccessor(Model, property.Name)) { @:@WrapComment("# ", string.Format("@return {0}{1}", property.ModelType.GetYardDocumentation(), CompositeTypeRb.GetPropertyDocumentationString(property))) - // @:@(property.IsReadOnly ? "attr_reader" : "attr_accessor") :@property.Name @:attr_accessor :@property.Name @EmptyLine @: From 0858bed5bfc108a8c1447fc259af3c0d4f92af3d Mon Sep 17 00:00:00 2001 From: Sarangan Rajamanickam Date: Wed, 1 Feb 2017 11:15:51 -0800 Subject: [PATCH 4/7] Minor formatting --- src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs | 4 ++-- .../AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs b/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs index ca57e6e87e..ed8c517644 100644 --- a/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs @@ -66,14 +66,14 @@ public override async Task Generate(CodeModel cm) continue; } - if ( codeModel.pageModels.Any( each => each.Name.EqualsIgnoreCase(model.Name ) ) ) + if (codeModel.pageModels.Any( each => each.Name.EqualsIgnoreCase(model.Name))) { // Skip, handled in the .pageModels section below. continue; } var modelTemplate = new AzureModelTemplate { Model = model }; - if (!CompositeTypeRba.resourceOrSubResourceRegEx.IsMatch(model.Name.ToString()) || !CompositeTypeRba.IsResourceModelMatchingStandardDefinition(model)) + if (!CompositeTypeRba.resourceOrSubResourceRegEx.IsMatch(model.Name) || !CompositeTypeRba.IsResourceModelMatchingStandardDefinition(model)) { await Write(modelTemplate, Path.Combine(GeneratorSettingsRb.Instance.modelsPath, CodeNamer.UnderscoreCase(model.Name) + ImplementationFileExtension)); } diff --git a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs index 009df47f28..54262602b9 100644 --- a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs @@ -16,9 +16,9 @@ namespace AutoRest.Ruby.Azure.Model /// public class CompositeTypeRba : CompositeTypeRb { - public static readonly Regex resourceOrSubResourceRegEx = new Regex(@"^(RESOURCE|SUBRESOURCE)$", RegexOptions.IgnoreCase); - private static readonly Regex subResourceRegEx = new Regex(@"^(ID)$", RegexOptions.IgnoreCase); - private static readonly Regex resourceRegEx = new Regex(@"^(ID|NAME|TYPE|LOCATION|TAGS)$", RegexOptions.IgnoreCase); + public static readonly Regex resourceOrSubResourceRegEx = new Regex(@"^(RESOURCE|SUBRESOURCE)$", RegexOptions.IgnoreCase); + private static readonly Regex subResourceRegEx = new Regex(@"^(ID)$", RegexOptions.IgnoreCase); + private static readonly Regex resourceRegEx = new Regex(@"^(ID|NAME|TYPE|LOCATION|TAGS)$", RegexOptions.IgnoreCase); /// /// Initializes a new instance of the AzureModelTemplateModel class. @@ -109,7 +109,6 @@ public static bool NeedsAccessor(CompositeType model, string propertyName) return true; } - /// /// Gets the list of modules/classes which need to be included. /// From 0cc3bea6d3ebac2138a5e139a66a033f4f98fd70 Mon Sep 17 00:00:00 2001 From: Sarangan Rajamanickam Date: Wed, 1 Feb 2017 11:17:47 -0800 Subject: [PATCH 5/7] Changing comments --- src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs index 54262602b9..f8236e328b 100644 --- a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs @@ -67,8 +67,8 @@ public override string GetBaseTypeName() } /// - /// Checks if the provided definition of models 'Resource'/'SubResource' matches the standard definition. - /// For other models, it returns false. + /// Checks if the provided definition of models 'Resource'/'SubResource' matches the standard definition, + /// as defined in MsResAzure. For other models, it returns false. /// /// to be validated /// @@ -92,7 +92,7 @@ public static bool IsResourceModelMatchingStandardDefinition(CompositeType model /// /// Determines if the accessor needs to be generated. For Resource/SubResource models, accessors are generated only - /// for properties that are not in the standard definition. + /// for properties that are not in the standard definition, as defined in MsRestAzure. /// /// /// From 3f857a17a00418704042c48a2bb650edb0054165 Mon Sep 17 00:00:00 2001 From: Sarangan Rajamanickam Date: Wed, 1 Feb 2017 12:30:23 -0800 Subject: [PATCH 6/7] Nit pick fix --- src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs b/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs index ed8c517644..ef56a9aa85 100644 --- a/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/CodeGeneratorRba.cs @@ -66,7 +66,7 @@ public override async Task Generate(CodeModel cm) continue; } - if (codeModel.pageModels.Any( each => each.Name.EqualsIgnoreCase(model.Name))) + if (codeModel.pageModels.Any(each => each.Name.EqualsIgnoreCase(model.Name))) { // Skip, handled in the .pageModels section below. continue; From 9f5c1f660b8e53b97358ee7d920c73a490de2c86 Mon Sep 17 00:00:00 2001 From: Sarangan Rajamanickam Date: Wed, 1 Feb 2017 14:51:14 -0800 Subject: [PATCH 7/7] Fix Typo --- src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs index f8236e328b..24d26ddbe2 100644 --- a/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs +++ b/src/generator/AutoRest.Ruby.Azure/Model/CompositeTypeRba.cs @@ -68,7 +68,7 @@ public override string GetBaseTypeName() /// /// Checks if the provided definition of models 'Resource'/'SubResource' matches the standard definition, - /// as defined in MsResAzure. For other models, it returns false. + /// as defined in MsRestAzure. For other models, it returns false. /// /// to be validated ///