Merge pull request #2 from Azure/master

Merge changes from base repository
Azure · Mar 1, 2016 · 705495a · 705495a
2 parents 3c0682e + 77613e4
commit 705495a
Show file tree

Hide file tree

Showing 551 changed files with 14,164 additions and 4,256 deletions.
diff --git a/AutoRest/AutoRest.Core/ClientModel/CompositeType.cs b/AutoRest/AutoRest.Core/ClientModel/CompositeType.cs
@@ -28,7 +28,7 @@ public CompositeType()
         /// <summary>
         /// Gets or sets the list of CompositeType properties.
         /// </summary>
-        public IList<Property> Properties { get; private set; }
+        public List<Property> Properties { get; private set; }
 
         /// <summary>
         /// Gets the union of Parent and current type properties
@@ -75,7 +75,7 @@ public IEnumerable<Property> ComposedProperties
         /// <summary>
         /// Gets the union of Parent and current type properties
         /// </summary>
-        public IDictionary<string, object> ComposedExtensions
+        public Dictionary<string, object> ComposedExtensions
         {
             get
             {

diff --git a/AutoRest/AutoRest.Core/ClientModel/EnumType.cs b/AutoRest/AutoRest.Core/ClientModel/EnumType.cs
@@ -22,7 +22,7 @@ public EnumType()
         /// <summary>
         /// Gets or sets the enum values. 
         /// </summary>
-        public IList<EnumValue> Values { get; private set; }
+        public List<EnumValue> Values { get; private set; }
 
         /// <summary>
         /// Gets or sets the model type name on the wire.

diff --git a/AutoRest/AutoRest.Core/ClientModel/Method.cs b/AutoRest/AutoRest.Core/ClientModel/Method.cs
@@ -91,7 +91,7 @@ public Parameter Body
         /// <summary>
         /// Gets the list of input Parameter transformations
         /// </summary>
-        public IList<ParameterTransformation> InputParameterTransformation { get; private set; }
+        public List<ParameterTransformation> InputParameterTransformation { get; private set; }
 
         /// <summary>
         /// Gets or sets request headers.
@@ -168,7 +168,8 @@ public override string ToString()
         /// <returns></returns>
         public object Clone()
         {
-            Method newMethod = (Method)this.MemberwiseClone();
+            Method newMethod = new Method();
+            newMethod.LoadFrom(this);
             newMethod.Extensions = new Dictionary<string, object>();
             newMethod.Parameters = new List<Parameter>();
             newMethod.RequestHeaders = new Dictionary<string, string>();

diff --git a/AutoRest/AutoRest.Core/ClientModel/Parameter.cs b/AutoRest/AutoRest.Core/ClientModel/Parameter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Microsoft.Rest.Generator.Utilities;
 
 namespace Microsoft.Rest.Generator.ClientModel
 {
@@ -99,7 +100,8 @@ public override string ToString()
         /// <returns>A deep clone of current object.</returns>
         public object Clone()
         {
-            Parameter param = (Parameter)this.MemberwiseClone();
+            Parameter param = new Parameter();
+            param.LoadFrom(this);
             return param;
         }
     }

diff --git a/AutoRest/AutoRest.Core/ClientModel/ParameterMapping.cs b/AutoRest/AutoRest.Core/ClientModel/ParameterMapping.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Rest.Generator.ClientModel
 {
     using System;
     using System.Globalization;
-
+    using Utilities;
     /// <summary>
     /// Defines a parameter mapping.
     /// </summary>
@@ -53,11 +53,8 @@ public override string ToString()
         /// <returns>A deep clone of current object.</returns>
         public object Clone()
         {
-            //ParameterMapping paramMapping = (ParameterMapping)this.MemberwiseClone();
-            //return paramMapping;
-
             ParameterMapping mapping = new ParameterMapping();
-            mapping.InputParameter = this.InputParameter;
+            mapping.InputParameter = (Parameter)this.InputParameter.Clone();
             mapping.InputParameterProperty = this.InputParameterProperty;
             mapping.OutputParameterProperty = this.OutputParameterProperty;
             return mapping;

diff --git a/AutoRest/AutoRest.Core/ClientModel/ParameterTransformation.cs b/AutoRest/AutoRest.Core/ClientModel/ParameterTransformation.cs
@@ -25,7 +25,7 @@ public ParameterTransformation()
         /// <summary>
         /// Gets the list of Parameter Mappings
         /// </summary>
-        public IList<ParameterMapping> ParameterMappings { get; private set; }
+        public List<ParameterMapping> ParameterMappings { get; private set; }
 
         /// <summary>
         /// Returns a string representation of the ParameterMapping object.

diff --git a/AutoRest/AutoRest.Core/ClientModel/Property.cs b/AutoRest/AutoRest.Core/ClientModel/Property.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Microsoft.Rest.Generator.Utilities;
 
 namespace Microsoft.Rest.Generator.ClientModel
 {
@@ -93,7 +94,10 @@ public override string ToString()
         /// <returns>A deep clone of current object.</returns>
         public object Clone()
         {
-            var property = (Property) this.MemberwiseClone();
+            Property property = new Property();
+            property.LoadFrom(this);
+            property.Constraints = new Dictionary<Constraint, string>(this.Constraints);
+            property.Extensions = new Dictionary<string, object>(this.Extensions);
             return property;
         }
     }

diff --git a/AutoRest/AutoRest.Core/ClientModel/ServiceClient.cs b/AutoRest/AutoRest.Core/ClientModel/ServiceClient.cs
@@ -55,32 +55,32 @@ public ServiceClient()
         /// <summary>
         /// Gets or sets the client parameters.
         /// </summary>
-        public IList<Property> Properties { get; private set; }
+        public List<Property> Properties { get; private set; }
 
         /// <summary>
         /// Gets the model types.
         /// </summary>
-        public ISet<CompositeType> ModelTypes { get; private set; }
+        public HashSet<CompositeType> ModelTypes { get; private set; }
 
         /// <summary>
         /// Gets the enum types.
         /// </summary>
-        public ISet<EnumType> EnumTypes { get; private set; }
+        public HashSet<EnumType> EnumTypes { get; private set; }
 
         /// <summary>
         /// Gets the list of error type for customize exceptions.
         /// </summary>
-        public ISet<CompositeType> ErrorTypes { get; private set; }
+        public HashSet<CompositeType> ErrorTypes { get; private set; }
 
         /// <summary>
         /// Gets the list of header types.
         /// </summary>
-        public ISet<CompositeType> HeaderTypes { get; private set; }
+        public HashSet<CompositeType> HeaderTypes { get; private set; }
 
         /// <summary>
         /// Gets the methods.
         /// </summary>
-        public IList<Method> Methods { get; private set; }
+        public List<Method> Methods { get; private set; }
 
         /// <summary>
         /// Gets the method groups.

diff --git a/AutoRest/AutoRest.Core/CodeNamer.cs b/AutoRest/AutoRest.Core/CodeNamer.cs
@@ -198,16 +198,12 @@ public virtual void NormalizeMethod(Method method)
                 {
                     if (parameterMapping.InputParameterProperty != null)
                     {
-                        parameterMapping.InputParameterProperty = string.Join(".",
-                            parameterMapping.InputParameterProperty.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries)
-                                .Select(p => GetPropertyName(p)));
+                        parameterMapping.InputParameterProperty = GetPropertyName(parameterMapping.InputParameterProperty);
                     }
 
                     if (parameterMapping.OutputParameterProperty != null)
                     {
-                        parameterMapping.OutputParameterProperty = string.Join(".",
-                            parameterMapping.OutputParameterProperty.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries)
-                                .Select(p => GetPropertyName(p)));
+                        parameterMapping.OutputParameterProperty = GetPropertyName(parameterMapping.OutputParameterProperty);
                     }
                 }
             }

diff --git a/AutoRest/AutoRest.Core/GlobalSuppressions.cs b/AutoRest/AutoRest.Core/GlobalSuppressions.cs
@@ -53,4 +53,10 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Rfc", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.KnownPrimaryType.#DateTimeRfc1123")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.PrimaryType.#Type")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "FileSystem", Scope = "member", Target = "Microsoft.Rest.Generator.Extensibility.ExtensionsLoader.#GetConfigurationFileContent(Microsoft.Rest.Generator.Settings)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.CompositeType.#Properties")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.EnumType.#Values")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.Method.#InputParameterTransformation")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Methods")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ServiceClient.#Properties")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists", Scope = "member", Target = "Microsoft.Rest.Generator.ClientModel.ParameterTransformation.#ParameterMappings")]
 
diff --git a/AutoRest/AutoRest.Core/Utilities/Extensions.cs b/AutoRest/AutoRest.Core/Utilities/Extensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -168,6 +169,15 @@ public static TU LoadFrom<TU, TV>(this TU destination, TV source)
                     sourceProperty.PropertyType == destinationProperty.PropertyType &&
                     sourceProperty.SetMethod != null)
                 {
+                    if (destinationProperty.PropertyType.IsGenericType && sourceProperty.GetValue(source, null) is IEnumerable)
+                    {
+                        var ctor = destinationProperty.PropertyType.GetConstructor(new[] { destinationProperty.PropertyType });
+                        if (ctor != null)
+                        {
+                            destinationProperty.SetValue(destination, ctor.Invoke(new[] { sourceProperty.GetValue(source, null) }), null);
+                            continue;
+                        }
+                    }
                     destinationProperty.SetValue(destination, sourceProperty.GetValue(source, null), null);
                 }
             }