Merge pull request #3360 from wing328/csharp_escape_double_hyphen

[C#] fix double hyphen in c# generator

Author: wing328

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java

@@ -669,7 +669,7 @@ public String escapeQuotationMark(String input) {
 
     @Override
     public String escapeUnsafeCharacters(String input) {
-        return input.replace("*/", "*_/").replace("/*", "/_*");
+        return input.replace("*/", "*_/").replace("/*", "/_*").replace("--", "- -");
     }
 
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java

@@ -414,10 +414,10 @@ public String toEnumVarName(String value, String datatype) {
 
         // string
         String var = value.replaceAll("_", " ");
-        var = WordUtils.capitalizeFully(var);
+        //var = WordUtils.capitalizeFully(var);
+        var = camelize(var);
         var = var.replaceAll("\\W+", "");
 
-
         if (var.matches("\\d.*")) {
             return "_" + var;
         } else {

modules/swagger-codegen/src/test/resources/2_0/petstore-security-test.yaml

@@ -1,68 +1,68 @@
 swagger: '2.0'
 info:
-  description: "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  */ ' \" =end \r\n \n \r"
-  version: 1.0.0 */ ' " =end \r\n \n \r
-  title: Swagger Petstore */ ' " =end \r\n \n \r
-  termsOfService: http://swagger.io/terms/ */ ' " =end \r\n \n \r
+  description: "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  */ ' \" =end -- \r\n \n \r"
+  version: 1.0.0 */ ' " =end -- \r\n \n \r
+  title: Swagger Petstore */ ' " =end -- \r\n \n \r
+  termsOfService: http://swagger.io/terms/ */ ' " =end -- \r\n \n \r
   contact:
-    email: [email protected] */ ' " =end \r\n \n \r
+    email: [email protected] */ ' " =end -- \r\n \n \r
   license:
-    name: Apache 2.0 */ ' " =end \r\n \n \r
-    url: http://www.apache.org/licenses/LICENSE-2.0.html */ ' " =end \r\n \n \r
-host: petstore.swagger.io */ ' " =end \r\n \n \r
-basePath: /v2 */ ' " =end \r\n \n \r
+    name: Apache 2.0 */ ' " =end -- \r\n \n \r
+    url: http://www.apache.org/licenses/LICENSE-2.0.html */ ' " =end -- \r\n \n \r
+host: petstore.swagger.io */ ' " =end -- \r\n \n \r
+basePath: /v2 */ ' " =end -- \r\n \n \r
 tags:
   - name: fake
-    description: Everything about your Pets */ ' " =end \r\n \n \r
+    description: Everything about your Pets */ ' " =end -- \r\n \n \r
     externalDocs:
-      description: Find out more */ ' " =end \r\n \n \r
+      description: Find out more */ ' " =end -- \r\n \n \r
       url: 'http://swagger.io'
 schemes:
-  - http */ ' " =end \r\n \n \r
+  - http */ ' " =end -- \r\n \n \r
 paths:
   /fake:
     put:
       tags:
         - fake
-      summary: To test code injection */ ' " =end \r\n \n \r
-      descriptions:  To test code injection */ ' " =end \r\n \n \r
-      operationId: testCodeInject */ ' " =end \r\n \n \r
+      summary: To test code injection */ ' " =end -- \r\n \n \r
+      descriptions:  To test code injection */ ' " =end -- \r\n \n \r
+      operationId: testCodeInject */ ' " =end -- \r\n \n \r
       consumes:
         - application/json
-        - "*/ ' \" =end \r\n \n \r"
+        - "*/ ' \" =end -- \r\n \n \r"
       produces:
         - application/json
-        - "*/ ' \" =end \r\n \n \r"
+        - "*/ ' \" =end -- \r\n \n \r"
       parameters:
-        - name: test code inject */ ' " =end \r\n \n \r
+        - name: test code inject */ ' " =end -- \r\n \n \r
           type: string
           in: formData 
-          description: To test code injection */ ' " =end \r\n \n \r
+          description: To test code injection */ ' " =end -- \r\n \n \r
       responses:
         '400':
-          description: To test code injection */ ' " =end \r\n \n \r
+          description: To test code injection */ ' " =end -- \r\n \n \r
 securityDefinitions:
   petstore_auth:
     type: oauth2
     authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog'
     flow: implicit
     scopes:
-      'write:pets': modify pets in your account  */ ' " =end \r\n \n \r
-      'read:pets': read your pets  */ ' " =end \r\n \n \r
+      'write:pets': modify pets in your account  */ ' " =end -- \r\n \n \r
+      'read:pets': read your pets  */ ' " =end -- \r\n \n \r
   api_key:
     type: apiKey
-    name: api_key  */ ' " =end \r\n \n \r
+    name: api_key  */ ' " =end -- \r\n \n \r
     in: header
 definitions:
   Return:
-    description: Model for testing reserved words  */ ' " =end \r\n \n \r
+    description: Model for testing reserved words  */ ' " =end -- \r\n \n \r
     properties:
       return:
-        description: property description  */ ' " =end \r\n \n \r
+        description: property description  */ ' " =end -- \r\n \n \r
         type: integer
         format: int32
     xml:
       name: Return
 externalDocs:
-  description: Find out more about Swagger  */ ' " =end \r\n \n \r
+  description: Find out more about Swagger  */ ' " =end -- \r\n \n \r
   url: 'http://swagger.io'

samples/client/petstore-security-test/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", "{29125490-71E4-47ED-B0D7-34505F58103C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{8CE139DF-64BC-4591-85F8-8506C2B67514}"
 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
-{29125490-71E4-47ED-B0D7-34505F58103C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-{29125490-71E4-47ED-B0D7-34505F58103C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-{29125490-71E4-47ED-B0D7-34505F58103C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-{29125490-71E4-47ED-B0D7-34505F58103C}.Release|Any CPU.Build.0 = Release|Any CPU
+{8CE139DF-64BC-4591-85F8-8506C2B67514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{8CE139DF-64BC-4591-85F8-8506C2B67514}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{8CE139DF-64BC-4591-85F8-8506C2B67514}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{8CE139DF-64BC-4591-85F8-8506C2B67514}.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-security-test/csharp/SwaggerClient/IO.Swagger.userprefs

@@ -1,9 +1,9 @@
-<Properties>
+<Properties StartupItem="src/IO.Swagger/IO.Swagger.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workbench ActiveDocument="src/IO.Swagger/Client/Configuration.cs">
     <Files>
-      <File FileName="src/IO.Swagger/Client/ApiClient.cs" Line="72" Column="77" />
-      <File FileName="src/IO.Swagger/Client/Configuration.cs" Line="311" Column="58" />
+      <File FileName="src/IO.Swagger/Client/ApiClient.cs" Line="1" Column="1" />
+      <File FileName="src/IO.Swagger/Client/Configuration.cs" Line="22" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>

samples/client/petstore-security-test/csharp/SwaggerClient/README.md

@@ -1,21 +1,21 @@
-# IO.Swagger - the C# library for the Swagger Petstore  ' \" =end
+# IO.Swagger - the C# library for the Swagger Petstore *_/ ' \" =end - - \\r\\n \\n \\r
 
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\   ' \" =end
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end - -       
 
 This C# SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
 
-- API version: 1.0.0  ' \" =end
+- API version: 1.0.0 *_/ ' \" =end - - \\r\\n \\n \\r
 - SDK version: 1.0.0
-- Build date: 2016-06-29T22:47:27.264+08:00
+- Build date: 2016-07-13T18:16:08.689+08:00
 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen
 
 ## Frameworks supported
 - .NET 4.0 or later
 - Windows Phone 7.1 (Mango)
 
 ## Dependencies
-- [RestSharp] (https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
-- [Json.NET] (https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later
+- [RestSharp](https://www.nuget.org/packages/RestSharp) - 105.1.0 or later
+- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 7.0.0 or later
 
 The DLLs included in the package may not be the latest version. We recommned using [NuGet] (https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
 ```
@@ -54,43 +54,44 @@ namespace Example
         {
 
             var apiInstance = new FakeApi();
-            var testCodeInjectEnd = testCodeInjectEnd_example;  // string | To test code injection  ' \" =end (optional) 
+            var testCodeInjectEndRnNR = testCodeInjectEndRnNR_example;  // string | To test code injection *_/ ' \" =end - - \\r\\n \\n \\r (optional) 
 
             try
             {
-                // To test code injection  ' \" =end
-                apiInstance.TestCodeInjectEnd(testCodeInjectEnd);
+                // To test code injection *_/ ' \" =end - - \\r\\n \\n \\r
+                apiInstance.TestCodeInjectEndRnNR(testCodeInjectEndRnNR);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling FakeApi.TestCodeInjectEnd: " + e.Message );
+                Debug.Print("Exception when calling FakeApi.TestCodeInjectEndRnNR: " + e.Message );
             }
         }
     }
 }
 ```
 
+<a name="documentation-for-api-endpoints"></a>
 ## Documentation for API Endpoints
 
-All URIs are relative to *https://petstore.swagger.io  ' \" =end/v2  ' \" =end*
+All URIs are relative to *https://petstore.swagger.io *_/ ' \" =end - - \\r\\n \\n \\r/v2 *_/ ' \" =end - - \\r\\n \\n \\r*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*FakeApi* | [**TestCodeInjectEnd**](docs/FakeApi.md#testcodeinjectend) | **PUT** /fake | To test code injection  ' \" =end
+*FakeApi* | [**TestCodeInjectEndRnNR**](docs/FakeApi.md#testcodeinjectendrnnr) | **PUT** /fake | To test code injection *_/ ' \" =end - - \\r\\n \\n \\r
 
 
+<a name="documentation-for-models"></a>
 ## Documentation for Models
 
  - [Model.ModelReturn](docs/ModelReturn.md)
 
 
 ## Documentation for Authorization
 
-
 ### api_key
 
 - **Type**: API key
-- **API key parameter name**: api_key  */ &#39; &quot; &#x3D;end
+- **API key parameter name**: api_key  */ &#39; &quot; &#x3D;end -- \r\n \n \r
 - **Location**: HTTP header
 
 ### petstore_auth
@@ -99,6 +100,6 @@ Class | Method | HTTP request | Description
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
 - **Scopes**: 
-  - write:pets: modify pets in your account  */ &#39; &quot; &#x3D;end
-  - read:pets: read your pets  */ &#39; &quot; &#x3D;end
+  - write:pets: modify pets in your account  */ &#39; &quot; &#x3D;end -- \r\n \n \r
+  - read:pets: read your pets  */ &#39; &quot; &#x3D;end -- \r\n \n \r
 

samples/client/petstore-security-test/csharp/SwaggerClient/docs/FakeApi.md

@@ -1,16 +1,17 @@
 # IO.Swagger.Api.FakeApi
 
-All URIs are relative to *https://petstore.swagger.io  ' \" =end/v2  ' \" =end*
+All URIs are relative to *https://petstore.swagger.io *_/ ' \" =end - - \\r\\n \\n \\r/v2 *_/ ' \" =end - - \\r\\n \\n \\r*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**TestCodeInjectEnd**](FakeApi.md#testcodeinjectend) | **PUT** /fake | To test code injection  ' \" =end
+[**TestCodeInjectEndRnNR**](FakeApi.md#testcodeinjectendrnnr) | **PUT** /fake | To test code injection *_/ ' \" =end - - \\r\\n \\n \\r
 
 
-# **TestCodeInjectEnd**
-> void TestCodeInjectEnd (string testCodeInjectEnd = null)
+<a name="testcodeinjectendrnnr"></a>
+# **TestCodeInjectEndRnNR**
+> void TestCodeInjectEndRnNR (string testCodeInjectEndRnNR = null)
 
-To test code injection  ' \" =end
+To test code injection *_/ ' \" =end - - \\r\\n \\n \\r
 
 ### Example
 ```csharp
@@ -22,22 +23,22 @@ using IO.Swagger.Model;
 
 namespace Example
 {
-    public class TestCodeInjectEndExample
+    public class TestCodeInjectEndRnNRExample
     {
         public void main()
         {
 
             var apiInstance = new FakeApi();
-            var testCodeInjectEnd = testCodeInjectEnd_example;  // string | To test code injection  ' \" =end (optional) 
+            var testCodeInjectEndRnNR = testCodeInjectEndRnNR_example;  // string | To test code injection *_/ ' \" =end - - \\r\\n \\n \\r (optional) 
 
             try
             {
-                // To test code injection  ' \" =end
-                apiInstance.TestCodeInjectEnd(testCodeInjectEnd);
+                // To test code injection *_/ ' \" =end - - \\r\\n \\n \\r
+                apiInstance.TestCodeInjectEndRnNR(testCodeInjectEndRnNR);
             }
             catch (Exception e)
             {
-                Debug.Print("Exception when calling FakeApi.TestCodeInjectEnd: " + e.Message );
+                Debug.Print("Exception when calling FakeApi.TestCodeInjectEndRnNR: " + e.Message );
             }
         }
     }
@@ -48,7 +49,7 @@ namespace Example
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **testCodeInjectEnd** | **string**| To test code injection  &#39; \&quot; &#x3D;end | [optional] 
+ **testCodeInjectEndRnNR** | **string**| To test code injection *_/ &#39; \&quot; &#x3D;end - - \\r\\n \\n \\r | [optional] 
 
 ### Return type
 
@@ -60,8 +61,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: application/json, */ '  =end
- - **Accept**: application/json, */ '  =end
+ - **Content-Type**: application/json, *_/ '  =end - -       
+ - **Accept**: application/json, *_/ '  =end - -       
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 

samples/client/petstore-security-test/csharp/SwaggerClient/docs/ModelReturn.md

@@ -3,7 +3,7 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_Return** | **int?** | property description   ' \" =end | [optional] 
+**_Return** | **int?** | property description  *_/ ' \" =end - - \\r\\n \\n \\r | [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-security-test/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Swagger Petstore  ' \" =end
+Swagger Petstore *_/ ' \" =end - - \\r\\n \\n \\r
 
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\   ' \" =end
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end - -       
 
-OpenAPI spec version: 1.0.0  ' \" =end
-Contact: [email protected]  ' \" =end
+OpenAPI spec version: 1.0.0 *_/ ' \" =end - - \\r\\n \\n \\r
+Contact: [email protected] *_/ ' \" =end - - \\r\\n \\n \\r
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -86,7 +86,7 @@ limitations under the License.
   <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
       <ProjectReference Include="..\IO.Swagger\IO.Swagger.csproj">
-          <Project>{29125490-71E4-47ED-B0D7-34505F58103C}</Project>
+          <Project>{8CE139DF-64BC-4591-85F8-8506C2B67514}</Project>
           <Name>IO.Swagger</Name>
       </ProjectReference>
   </ItemGroup>