Fix spec for map and array

modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -949,8 +949,17 @@ definitions:
           - -1.2
   AdditionalPropertiesClass:
     type: object
-    additionalProperties:
-      type: string
+    properties:
+      map_property:
+        type: object
+        additionalProperties:
+          type: string
+      map_of_map_property:
+        type: object
+        additionalProperties:
+          type: object
+          additionalProperties:
+            type: string
   MixedPropertiesAndAdditionalPropertiesClass:
     type: object
     properties:
@@ -960,9 +969,10 @@ definitions:
       dateTime:
         type: string
         format: date-time
-    additionalProperties:
-      type: string
-      $ref: '#/definitions/Animal'
+      map: 
+        type: object
+        additionalProperties:
+          $ref: '#/definitions/Animal'
   ReadOnlyFirst:
     type: object
     properties:
@@ -973,23 +983,24 @@ definitions:
         type: string
   ArrayTest:
     type: object
-    array_of_string:
-      type: array
-      items:
-        type: string
-    array_array_of_integer:
-      type: array
-      items:
+    properties:
+      array_of_string:
         type: array
         items:
-          type: integer
-          format: int64
-    array_array_of_model:
-      type: array
-      items:
+          type: string
+      array_array_of_integer:
         type: array
         items:
-          $ref: '#/definitions/ReadOnlyFirst'
+          type: array
+          items:
+            type: integer
+            format: int64
+      array_array_of_model:
+        type: array
+        items:
+          type: array
+          items:
+            $ref: '#/definitions/ReadOnlyFirst'
 externalDocs:
   description: Find out more about Swagger
   url: 'http://swagger.io'

samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln

@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 VisualStudioVersion = 12.0.0.0
 MinimumVisualStudioVersion = 10.0.0.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{C81D6286-7BA5-4920-8591-F59169CCE4A4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}"
 EndProject
@@ -12,10 +12,10 @@ Debug|Any CPU = Debug|Any CPU
 Release|Any CPU = Release|Any CPU
 EndGlobalSection
 GlobalSection(ProjectConfigurationPlatforms) = postSolution
-{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}.Release|Any CPU.Build.0 = Release|Any CPU
+{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{C81D6286-7BA5-4920-8591-F59169CCE4A4}.Release|Any CPU.Build.0 = Release|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU

samples/client/petstore/csharp/SwaggerClient/README.md

@@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c
 
 - API version: 1.0.0
 - SDK version: 1.0.0
-- Build date: 2016-05-25T14:35:23.891+08:00
+- Build date: 2016-05-29T17:27:36.037+08:00
 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen
 
 ## Frameworks supported

samples/client/petstore/csharp/SwaggerClient/docs/AdditionalPropertiesClass.md

@@ -3,6 +3,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**MapProperty** | **Dictionary<string, string>** |  | [optional] 
+**MapOfMapProperty** | **Dictionary<string, Dictionary<string, string>>** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/csharp/SwaggerClient/docs/ArrayTest.md

@@ -3,6 +3,9 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**ArrayOfString** | **List<string>** |  | [optional] 
+**ArrayArrayOfInteger** | **List<List<long?>>** |  | [optional] 
+**ArrayArrayOfModel** | **List<List<ReadOnlyFirst>>** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/csharp/SwaggerClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md

@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Uuid** | **Guid?** |  | [optional] 
 **DateTime** | **DateTime?** |  | [optional] 
+**Map** | [**Dictionary<string, Animal>**](Animal.md) |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj

@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -59,38 +59,36 @@ limitations under the License.
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-      <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-      <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-      <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs" />
+    <Compile Include="**\*.cs"/>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+      <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
-      <Project>{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}</Project>
-      <Name>IO.Swagger</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="swagger-logo.png" />
+      <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
+          <Project>{C81D6286-7BA5-4920-8591-F59169CCE4A4}</Project>
+          <Name>IO.Swagger</Name>
+      </ProjectReference>
   </ItemGroup>
 </Project>
+

samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj

@@ -24,7 +24,7 @@ limitations under the License.
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D4DE6CAE-4BE8-4F73-862A-6E6B7DF37446}</ProjectGuid>
+    <ProjectGuid>{C81D6286-7BA5-4920-8591-F59169CCE4A4}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swagger Library</RootNamespace>

samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/AdditionalPropertiesClass.cs

@@ -37,15 +37,29 @@ namespace IO.Swagger.Model
     /// AdditionalPropertiesClass
     /// </summary>
     [DataContract]
-    public partial class AdditionalPropertiesClass : Dictionary<String, string>,  IEquatable<AdditionalPropertiesClass>
+    public partial class AdditionalPropertiesClass :  IEquatable<AdditionalPropertiesClass>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="AdditionalPropertiesClass" /> class.
         /// </summary>
-        public AdditionalPropertiesClass()
+        /// <param name="MapProperty">MapProperty.</param>
+        /// <param name="MapOfMapProperty">MapOfMapProperty.</param>
+        public AdditionalPropertiesClass(Dictionary<string, string> MapProperty = null, Dictionary<string, Dictionary<string, string>> MapOfMapProperty = null)
         {
+            this.MapProperty = MapProperty;
+            this.MapOfMapProperty = MapOfMapProperty;
         }
 
+        /// <summary>
+        /// Gets or Sets MapProperty
+        /// </summary>
+        [DataMember(Name="map_property", EmitDefaultValue=false)]
+        public Dictionary<string, string> MapProperty { get; set; }
+        /// <summary>
+        /// Gets or Sets MapOfMapProperty
+        /// </summary>
+        [DataMember(Name="map_of_map_property", EmitDefaultValue=false)]
+        public Dictionary<string, Dictionary<string, string>> MapOfMapProperty { get; set; }
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -54,6 +68,8 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class AdditionalPropertiesClass {\n");
+            sb.Append("  MapProperty: ").Append(MapProperty).Append("\n");
+            sb.Append("  MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -62,7 +78,7 @@ public override string ToString()
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public  new string ToJson()
+        public string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }
@@ -89,7 +105,17 @@ public bool Equals(AdditionalPropertiesClass other)
             if (other == null)
                 return false;
 
-            return false;
+            return 
+                (
+                    this.MapProperty == other.MapProperty ||
+                    this.MapProperty != null &&
+                    this.MapProperty.SequenceEqual(other.MapProperty)
+                ) && 
+                (
+                    this.MapOfMapProperty == other.MapOfMapProperty ||
+                    this.MapOfMapProperty != null &&
+                    this.MapOfMapProperty.SequenceEqual(other.MapOfMapProperty)
+                );
         }
 
         /// <summary>
@@ -103,6 +129,10 @@ public override int GetHashCode()
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
+                if (this.MapProperty != null)
+                    hash = hash * 59 + this.MapProperty.GetHashCode();
+                if (this.MapOfMapProperty != null)
+                    hash = hash * 59 + this.MapOfMapProperty.GetHashCode();
                 return hash;
             }
         }

samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/ArrayTest.cs

@@ -42,10 +42,31 @@ public partial class ArrayTest :  IEquatable<ArrayTest>
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayTest" /> class.
         /// </summary>
-        public ArrayTest()
+        /// <param name="ArrayOfString">ArrayOfString.</param>
+        /// <param name="ArrayArrayOfInteger">ArrayArrayOfInteger.</param>
+        /// <param name="ArrayArrayOfModel">ArrayArrayOfModel.</param>
+        public ArrayTest(List<string> ArrayOfString = null, List<List<long?>> ArrayArrayOfInteger = null, List<List<ReadOnlyFirst>> ArrayArrayOfModel = null)
         {
+            this.ArrayOfString = ArrayOfString;
+            this.ArrayArrayOfInteger = ArrayArrayOfInteger;
+            this.ArrayArrayOfModel = ArrayArrayOfModel;
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayOfString
+        /// </summary>
+        [DataMember(Name="array_of_string", EmitDefaultValue=false)]
+        public List<string> ArrayOfString { get; set; }
+        /// <summary>
+        /// Gets or Sets ArrayArrayOfInteger
+        /// </summary>
+        [DataMember(Name="array_array_of_integer", EmitDefaultValue=false)]
+        public List<List<long?>> ArrayArrayOfInteger { get; set; }
+        /// <summary>
+        /// Gets or Sets ArrayArrayOfModel
+        /// </summary>
+        [DataMember(Name="array_array_of_model", EmitDefaultValue=false)]
+        public List<List<ReadOnlyFirst>> ArrayArrayOfModel { get; set; }
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -54,6 +75,9 @@ public override string ToString()
         {
             var sb = new StringBuilder();
             sb.Append("class ArrayTest {\n");
+            sb.Append("  ArrayOfString: ").Append(ArrayOfString).Append("\n");
+            sb.Append("  ArrayArrayOfInteger: ").Append(ArrayArrayOfInteger).Append("\n");
+            sb.Append("  ArrayArrayOfModel: ").Append(ArrayArrayOfModel).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -89,7 +113,22 @@ public bool Equals(ArrayTest other)
             if (other == null)
                 return false;
 
-            return false;
+            return 
+                (
+                    this.ArrayOfString == other.ArrayOfString ||
+                    this.ArrayOfString != null &&
+                    this.ArrayOfString.SequenceEqual(other.ArrayOfString)
+                ) && 
+                (
+                    this.ArrayArrayOfInteger == other.ArrayArrayOfInteger ||
+                    this.ArrayArrayOfInteger != null &&
+                    this.ArrayArrayOfInteger.SequenceEqual(other.ArrayArrayOfInteger)
+                ) && 
+                (
+                    this.ArrayArrayOfModel == other.ArrayArrayOfModel ||
+                    this.ArrayArrayOfModel != null &&
+                    this.ArrayArrayOfModel.SequenceEqual(other.ArrayArrayOfModel)
+                );
         }
 
         /// <summary>
@@ -103,6 +142,12 @@ public override int GetHashCode()
             {
                 int hash = 41;
                 // Suitable nullity checks etc, of course :)
+                if (this.ArrayOfString != null)
+                    hash = hash * 59 + this.ArrayOfString.GetHashCode();
+                if (this.ArrayArrayOfInteger != null)
+                    hash = hash * 59 + this.ArrayArrayOfInteger.GetHashCode();
+                if (this.ArrayArrayOfModel != null)
+                    hash = hash * 59 + this.ArrayArrayOfModel.GetHashCode();
                 return hash;
             }
         }