CsharpDotNet2Client - Use clientPackage in additionalProperties (#6581)

* CsharpDotNet2Client - Use clientPackage in additionalProperties if provided * Give execution rights for csharp-dotnet2-petstore.sh * Fix generation of C#.net2 apiPackage, modelPackage, clientPackage * Fix modelPackage property missing when generating models * Initialize clientPackage in constructor
swagger-api · Oct 3, 2017 · 74e3169 · 74e3169
1 parent 1896e96
commit 74e3169
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 130 deletions.
diff --git a/bin/csharp-dotnet2-petstore.sh b/bin/csharp-dotnet2-petstore.sh
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
diff --git a/...wagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/...wagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java
@@ -1,26 +1,16 @@
 package io.swagger.codegen.languages;
 
-import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenType;
-import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.SupportingFile;
-import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.MapProperty;
-import io.swagger.models.properties.Property;
-import io.swagger.codegen.CliOption;
-
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
 
 public class CsharpDotNet2ClientCodegen extends AbstractCSharpCodegen {
     public static final String CLIENT_PACKAGE = "clientPackage";
     protected String clientPackage = "IO.Swagger.Client";
-    protected String apiDocPath = "docs/"; 
+    protected String apiDocPath = "docs/";
     protected String modelDocPath = "docs/";
 
     public CsharpDotNet2ClientCodegen() {
@@ -33,8 +23,9 @@ public CsharpDotNet2ClientCodegen() {
         modelTemplateFiles.put("model.mustache", ".cs");
         apiTemplateFiles.put("api.mustache", ".cs");
 
-        setApiPackage("IO.Swagger.Api");
-        setModelPackage("IO.Swagger.Model");
+        setApiPackage(packageName + ".Api");
+        setModelPackage(packageName + ".Model");
+        setClientPackage(packageName + ".Client");
         setSourceFolder("src" + File.separator + "main" + File.separator + this.getName());
 
         modelDocTemplateFiles.put("model_doc.mustache", ".md");
@@ -57,7 +48,7 @@ public void processOpts() {
         super.processOpts();
 
         if (additionalProperties.containsKey(CLIENT_PACKAGE)) {
-            this.setClientPackage((String) additionalProperties.get(CLIENT_PACKAGE));
+            setClientPackage((String) additionalProperties.get(CLIENT_PACKAGE));
         } else {
             additionalProperties.put(CLIENT_PACKAGE, getClientPackage());
         }
@@ -90,8 +81,8 @@ public String modelPackage() {
         return packageName + ".Model";
     }
 
-    public String getClientPackage(){
-        return packageName + ".Client";
+    public String getClientPackage() {
+        return clientPackage;
     }
 
     public void setClientPackage(String clientPackage) {

diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiClient.mustache
@@ -11,7 +11,7 @@ using Newtonsoft.Json;
 using RestSharp;
 using RestSharp.Extensions;
 
-namespace {{packageName}}.Client
+namespace {{clientPackage}}
 {
     /// <summary>
     /// API client is mainly responible for making the HTTP call to the API backend.

diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/ApiException.mustache
@@ -1,6 +1,6 @@
 using System;
 
-namespace {{packageName}}.Client {
+namespace {{clientPackage}} {
   /// <summary>
   /// API Exception
   /// </summary>

diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache
@@ -5,7 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 
-namespace {{packageName}}.Client
+namespace {{clientPackage}}
 {
     /// <summary>
     /// Represents a set of configuration settings

diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/README.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/README.mustache
@@ -41,9 +41,9 @@ Run the following command to generate the DLL
 
 Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
 ```csharp
-using {{packageName}}.{{apiPackage}};
-using {{packageName}}.Client;
-using {{packageName}}.{{modelPackage}};
+using {{apiPackage}};
+using {{clientPackage}};
+using {{modelPackage}};
 ```
 <a name="getting-started"></a>
 ## Getting Started
@@ -52,7 +52,7 @@ using {{packageName}}.{{modelPackage}};
 using System;
 using System.Diagnostics;
 using {{apiPackage}};
-using {{packageName}}.Client;
+using {{clientPackage}};
 using {{modelPackage}};
 
 namespace Example

diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api.mustache
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using RestSharp;
-using {{packageName}}.Client;
-{{#hasImport}}using {{packageName}}.Model;
+using {{clientPackage}};
+{{#hasImport}}using {{modelPackage}};
 {{/hasImport}}
 
-namespace {{packageName}}.Api
+namespace {{apiPackage}}
 {
     {{#operations}}
     /// <summary>

diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api_doc.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api_doc.mustache
@@ -1,4 +1,4 @@
-# {{packageName}}.{{apiPackage}}.{{classname}}{{#description}}
+# {{apiPackage}}.{{classname}}{{#description}}
 {{description}}{{/description}}
 
 All URIs are relative to *{{{basePath}}}*
@@ -22,8 +22,8 @@ Method | HTTP request | Description
 ```csharp
 using System;
 using System.Diagnostics;
-using {{packageName}}.Api;
-using {{packageName}}.Client;
+using {{apiPackage}};
+using {{clientPackage}};
 using {{modelPackage}};
 
 namespace Example

diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model.mustache
@@ -7,7 +7,7 @@ using Newtonsoft.Json;
 
 {{#models}}
 {{#model}}
-namespace {{packageName}}.Model {
+namespace {{modelPackage}} {
 
   /// <summary>
   /// {{description}}

diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model_doc.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/model_doc.mustache
@@ -1,6 +1,6 @@
 {{#models}}
 {{#model}}
-# {{{packageName}}}.Model.{{{classname}}}
+# {{{modelPackage}}}.{{{classname}}}
 ## Properties
 
 Name | Type | Description | Notes

diff --git a/...es/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md b/...es/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md
@@ -28,9 +28,9 @@ Run the following command to generate the DLL
 
 Then include the DLL (under the `bin` folder) in the C# project, and use the namespaces:
 ```csharp
-using IO.Swagger.IO.Swagger.Api;
+using IO.Swagger.Api;
 using IO.Swagger.Client;
-using IO.Swagger.IO.Swagger.Model;
+using IO.Swagger.Model;
 ```
 <a name="getting-started"></a>
 ## Getting Started

diff --git a/...ient/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md b/...ient/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger..PetApi
+# IO.Swagger.Api.PetApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 

diff --git a/...nt/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md b/...nt/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger..StoreApi
+# IO.Swagger.Api.StoreApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*
 

diff --git a/...ent/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md b/...ent/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md
@@ -1,4 +1,4 @@
-# IO.Swagger..UserApi
+# IO.Swagger.Api.UserApi
 
 All URIs are relative to *http://petstore.swagger.io/v2*