diff --git a/bin/csharp-dotnet2-petstore.sh b/bin/csharp-dotnet2-petstore.sh old mode 100644 new mode 100755 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 index 5a73e826ff5e..ab85cf0c4fe2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -1,26 +1,15 @@ package io.swagger.codegen; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; - +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template; +import io.swagger.codegen.ignore.CodegenIgnoreProcessor; +import io.swagger.codegen.languages.AbstractJavaCodegen; +import io.swagger.codegen.utils.ImplementationVersion; +import io.swagger.models.*; +import io.swagger.models.auth.OAuth2Definition; +import io.swagger.models.auth.SecuritySchemeDefinition; +import io.swagger.models.parameters.Parameter; +import io.swagger.util.Json; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -28,27 +17,8 @@ import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.samskivert.mustache.Mustache; -import com.samskivert.mustache.Template; - -import io.swagger.codegen.ignore.CodegenIgnoreProcessor; -import io.swagger.codegen.languages.AbstractJavaCodegen; -import io.swagger.codegen.utils.ImplementationVersion; -import io.swagger.models.ComposedModel; -import io.swagger.models.Contact; -import io.swagger.models.Info; -import io.swagger.models.License; -import io.swagger.models.Model; -import io.swagger.models.Operation; -import io.swagger.models.Path; -import io.swagger.models.RefModel; -import io.swagger.models.SecurityRequirement; -import io.swagger.models.Swagger; -import io.swagger.models.Tag; -import io.swagger.models.auth.OAuth2Definition; -import io.swagger.models.auth.SecuritySchemeDefinition; -import io.swagger.models.parameters.Parameter; -import io.swagger.util.Json; +import java.io.*; +import java.util.*; public class DefaultGenerator extends AbstractGenerator implements Generator { protected final Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class); @@ -75,16 +45,16 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { this.config.additionalProperties().putAll(opts.getOpts().getProperties()); String ignoreFileLocation = this.config.getIgnoreFilePathOverride(); - if(ignoreFileLocation != null) { + if (ignoreFileLocation != null) { final File ignoreFile = new File(ignoreFileLocation); - if(ignoreFile.exists() && ignoreFile.canRead()) { + if (ignoreFile.exists() && ignoreFile.canRead()) { this.ignoreProcessor = new CodegenIgnoreProcessor(ignoreFile); } else { LOGGER.warn("Ignore file specified at {} is not valid. This will fall back to an existing ignore file if present in the output directory.", ignoreFileLocation); } } - if(this.ignoreProcessor == null) { + if (this.ignoreProcessor == null) { this.ignoreProcessor = new CodegenIgnoreProcessor(this.config.getOutputDir()); } @@ -102,7 +72,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { return scheme; } - private String getHost(){ + private String getHost() { StringBuilder hostBuilder = new StringBuilder(); hostBuilder.append(getScheme()); hostBuilder.append("://"); @@ -120,30 +90,30 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { private void configureGeneratorProperties() { // allows generating only models by specifying a CSV of models to generate, or empty for all - generateApis = System.getProperty("apis") != null ? true:null; - generateModels = System.getProperty("models") != null ? true: null; - generateSupportingFiles = System.getProperty("supportingFiles") != null ? true:null; + generateApis = System.getProperty("apis") != null ? true : null; + generateModels = System.getProperty("models") != null ? true : null; + generateSupportingFiles = System.getProperty("supportingFiles") != null ? true : null; if (generateApis == null && generateModels == null && generateSupportingFiles == null) { // no specifics are set, generate everything generateApis = generateModels = generateSupportingFiles = true; } else { - if(generateApis == null) { + if (generateApis == null) { generateApis = false; } - if(generateModels == null) { + if (generateModels == null) { generateModels = false; } - if(generateSupportingFiles == null) { + if (generateSupportingFiles == null) { generateSupportingFiles = false; } } // model/api tests and documentation options rely on parent generate options (api or model) and no other options. // They default to true in all scenarios and can only be marked false explicitly - generateModelTests = System.getProperty("modelTests") != null ? Boolean.valueOf(System.getProperty("modelTests")): true; - generateModelDocumentation = System.getProperty("modelDocs") != null ? Boolean.valueOf(System.getProperty("modelDocs")):true; - generateApiTests = System.getProperty("apiTests") != null ? Boolean.valueOf(System.getProperty("apiTests")): true; - generateApiDocumentation = System.getProperty("apiDocs") != null ? Boolean.valueOf(System.getProperty("apiDocs")):true; + generateModelTests = System.getProperty("modelTests") != null ? Boolean.valueOf(System.getProperty("modelTests")) : true; + generateModelDocumentation = System.getProperty("modelDocs") != null ? Boolean.valueOf(System.getProperty("modelDocs")) : true; + generateApiTests = System.getProperty("apiTests") != null ? Boolean.valueOf(System.getProperty("apiTests")) : true; + generateApiDocumentation = System.getProperty("apiDocs") != null ? Boolean.valueOf(System.getProperty("apiDocs")) : true; // Additional properties added for tests to exclude references in project related files @@ -153,7 +123,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { config.additionalProperties().put(CodegenConstants.GENERATE_API_DOCS, generateApiDocumentation); config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_DOCS, generateModelDocumentation); - if(!generateApiTests && !generateModelTests) { + if (!generateApiTests && !generateModelTests) { config.additionalProperties().put(CodegenConstants.EXCLUDE_TESTS, true); } if (System.getProperty("debugSwagger") != null) { @@ -190,7 +160,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { LOGGER.error("Missing required field info version. Default appVersion set to 1.0.0"); config.additionalProperties().put("appVersion", "1.0.0"); } - + if (StringUtils.isEmpty(info.getDescription())) { // set a default description if none if provided config.additionalProperties().put("appDescription", @@ -228,7 +198,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } - private void generateModelTests(List files, Map models, String modelName) throws IOException{ + private void generateModelTests(List files, Map models, String modelName) throws IOException { // to generate model test files for (String templateName : config.modelTestTemplateFiles().keySet()) { String suffix = config.modelTestTemplateFiles().get(templateName); @@ -273,15 +243,15 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { String modelNames = System.getProperty("models"); Set modelsToGenerate = null; - if(modelNames != null && !modelNames.isEmpty()) { + if (modelNames != null && !modelNames.isEmpty()) { modelsToGenerate = new HashSet(Arrays.asList(modelNames.split(","))); } Set modelKeys = definitions.keySet(); - if(modelsToGenerate != null && !modelsToGenerate.isEmpty()) { + if (modelsToGenerate != null && !modelsToGenerate.isEmpty()) { Set updatedKeys = new HashSet(); - for(String m : modelKeys) { - if(modelsToGenerate.contains(m)) { + for (String m : modelKeys) { + if (modelsToGenerate.contains(m)) { updatedKeys.add(m); } } @@ -289,7 +259,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } // store all processed models - Map allProcessedModels = new TreeMap(new Comparator() { + Map allProcessedModels = new TreeMap(new Comparator() { @Override public int compare(String o1, String o2) { Model model1 = definitions.get(o1); @@ -330,7 +300,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { return definitions.get(interf.getSimpleRef()); } } - if(parent != null) { + if (parent != null) { return definitions.get(parent.getReference()); } } @@ -343,7 +313,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { for (String name : modelKeys) { try { //don't generate models that have an import mapping - if(config.importMapping().containsKey(name)) { + if (config.importMapping().containsKey(name)) { LOGGER.info("Model " + name + " not imported due to import mapping"); continue; } @@ -363,11 +333,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { allProcessedModels = config.postProcessAllModels(allProcessedModels); // generate files based on processed models - for (String modelName: allProcessedModels.keySet()) { - Map models = (Map)allProcessedModels.get(modelName); + for (String modelName : allProcessedModels.keySet()) { + Map models = (Map) allProcessedModels.get(modelName); + models.put("modelPackage", config.modelPackage()); try { //don't generate models that have an import mapping - if(config.importMapping().containsKey(modelName)) { + if (config.importMapping().containsKey(modelName)) { continue; } Map modelTemplate = (Map) ((List) models.get("models")).get(0); @@ -389,14 +360,14 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { continue; } File written = processTemplateToFile(models, templateName, filename); - if(written != null) { + if (written != null) { files.add(written); } } - if(generateModelTests) { + if (generateModelTests) { generateModelTests(files, models, modelName); } - if(generateModelDocumentation) { + if (generateModelDocumentation) { // to generate model documentation files generateModelDocumentation(files, models, modelName); } @@ -418,13 +389,13 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { Map> paths = processPaths(swagger.getPaths()); Set apisToGenerate = null; String apiNames = System.getProperty("apis"); - if(apiNames != null && !apiNames.isEmpty()) { + if (apiNames != null && !apiNames.isEmpty()) { apisToGenerate = new HashSet(Arrays.asList(apiNames.split(","))); } - if(apisToGenerate != null && !apisToGenerate.isEmpty()) { + if (apisToGenerate != null && !apisToGenerate.isEmpty()) { Map> updatedPaths = new TreeMap>(); - for(String m : paths.keySet()) { - if(apisToGenerate.contains(m)) { + for (String m : paths.keySet()) { + if (apisToGenerate.contains(m)) { updatedPaths.put(m, paths.get(m)); } } @@ -445,6 +416,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { operation.put("basePathWithoutHost", basePathWithoutHost); operation.put("contextPath", contextPath); operation.put("baseName", tag); + operation.put("apiPackage", config.apiPackage()); operation.put("modelPackage", config.modelPackage()); operation.putAll(config.additionalProperties()); operation.put("classname", config.toApiName(tag)); @@ -452,7 +424,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { operation.put("importPath", config.toApiImport(tag)); operation.put("classFilename", config.toApiFilename(tag)); - if(!config.vendorExtensions().isEmpty()) { + if (!config.vendorExtensions().isEmpty()) { operation.put("vendorExtensions", config.vendorExtensions()); } @@ -482,12 +454,12 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } File written = processTemplateToFile(operation, templateName, filename); - if(written != null) { + if (written != null) { files.add(written); } } - if(generateApiTests) { + if (generateApiTests) { // to generate api test files for (String templateName : config.apiTestTemplateFiles().keySet()) { String filename = config.apiTestFilename(templateName, tag); @@ -505,7 +477,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } - if(generateApiDocumentation) { + if (generateApiDocumentation) { // to generate api documentation files for (String templateName : config.apiDocTemplateFiles().keySet()) { String filename = config.apiDocFilename(templateName, tag); @@ -538,7 +510,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } Set supportingFilesToGenerate = null; String supportingFiles = System.getProperty("supportingFiles"); - if(supportingFiles!= null && !supportingFiles.isEmpty()) { + if (supportingFiles != null && !supportingFiles.isEmpty()) { supportingFilesToGenerate = new HashSet(Arrays.asList(supportingFiles.split(","))); } @@ -558,20 +530,20 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { continue; } String templateFile; - if( support instanceof GlobalSupportingFile) { - templateFile = config.getCommonTemplateDir() + File.separator + support.templateFile; + if (support instanceof GlobalSupportingFile) { + templateFile = config.getCommonTemplateDir() + File.separator + support.templateFile; } else { templateFile = getFullTemplateFile(config, support.templateFile); } boolean shouldGenerate = true; - if(supportingFilesToGenerate != null && !supportingFilesToGenerate.isEmpty()) { + if (supportingFilesToGenerate != null && !supportingFilesToGenerate.isEmpty()) { shouldGenerate = supportingFilesToGenerate.contains(support.destinationFilename); } - if (!shouldGenerate){ + if (!shouldGenerate) { continue; } - if(ignoreProcessor.allowsFile(new File(outputFilename))) { + if (ignoreProcessor.allowsFile(new File(outputFilename))) { if (templateFile.endsWith("mustache")) { String template = readTemplate(templateFile); Mustache.Compiler compiler = Mustache.compiler(); @@ -623,8 +595,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { final String swaggerCodegenIgnore = ".swagger-codegen-ignore"; String ignoreFileNameTarget = config.outputFolder() + File.separator + swaggerCodegenIgnore; File ignoreFile = new File(ignoreFileNameTarget); - if(!ignoreFile.exists()) { - String ignoreFileNameSource = File.separator + config.getCommonTemplateDir() + File.separator + swaggerCodegenIgnore; + if (!ignoreFile.exists()) { + String ignoreFileNameSource = File.separator + config.getCommonTemplateDir() + File.separator + swaggerCodegenIgnore; String ignoreFileContents = readResourceContents(ignoreFileNameSource); try { writeToFile(ignoreFileNameTarget, ignoreFileContents); @@ -678,7 +650,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { bundle.put("swagger", this.swagger); bundle.put("basePath", basePath); - bundle.put("basePathWithoutHost",basePathWithoutHost); + bundle.put("basePathWithoutHost", basePathWithoutHost); bundle.put("scheme", getScheme()); bundle.put("contextPath", contextPath); bundle.put("apiInfo", apis); @@ -738,7 +710,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { private File processTemplateToFile(Map templateData, String templateName, String outputFilename) throws IOException { String adjustedOutputFilename = outputFilename.replaceAll("//", "/").replace('/', File.separatorChar); - if(ignoreProcessor.allowsFile(new File(adjustedOutputFilename))) { + if (ignoreProcessor.allowsFile(new File(adjustedOutputFilename))) { String templateFile = getFullTemplateFile(config, templateName); String template = readTemplate(templateFile); Mustache.Compiler compiler = Mustache.compiler(); @@ -762,7 +734,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } private static void processMimeTypes(List mimeTypeList, Map operation, String source) { - if (mimeTypeList == null || mimeTypeList.isEmpty()){ + if (mimeTypeList == null || mimeTypeList.isEmpty()) { return; } List> c = new ArrayList>(); @@ -876,7 +848,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { continue; } Map authMethods = new HashMap(); - for (Map> security: securities) { + for (Map> security : securities) { for (String securityName : security.keySet()) { SecuritySchemeDefinition securityDefinition = swagger.getSecurityDefinitions().get(securityName); if (securityDefinition == null) { @@ -905,8 +877,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { codegenOperation.authMethods = config.fromSecurity(authMethods); codegenOperation.hasAuthMethods = true; } - } - catch (Exception ex) { + } catch (Exception ex) { String msg = "Could not process operation:\n" // + " Tag: " + tag + "\n"// + " Operation: " + operation.getOperationId() + "\n" // @@ -1017,7 +988,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } } List> imports = new ArrayList>(); - for(String s: importSet) { + for (String s : importSet) { Map item = new HashMap(); item.put("import", s); imports.add(item); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java index 73914ea53764..125b688858f2 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CsharpDotNet2ClientCodegen.java +++ b/modules/swagger-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 class CsharpDotNet2ClientCodegen extends AbstractCSharpCodegen { 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 class CsharpDotNet2ClientCodegen extends AbstractCSharpCodegen { 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 class CsharpDotNet2ClientCodegen extends AbstractCSharpCodegen { 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 index 5bd93d066a11..4c8d13c5a998 100644 --- 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}} { /// /// 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 index dd618e0a99c2..1bc6d7c5a6f4 100644 --- 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}} { /// /// API Exception /// diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/Configuration.mustache index 56f4e617556b..a175367ab74a 100644 --- 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}} { /// /// 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 index 89ed69c1df87..89fa3938d97b 100644 --- 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}}; ``` ## 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 index fc7583b182c0..4a7ccbbe3787 100644 --- 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}} /// diff --git a/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api_doc.mustache b/modules/swagger-codegen/src/main/resources/CsharpDotNet2/api_doc.mustache index c8b447c3a447..d8a074e11f31 100644 --- 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 index 3e6e32320e71..61dbfe639098 100644 --- 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}} { /// /// {{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 index aff3e7e0d1e4..e7c3ed75934c 100644 --- 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/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md index acdc92a185e4..a9d7285c9256 100644 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/README.md +++ b/samples/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; ``` ## Getting Started diff --git a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md index 2487b1e5fdda..e67561a8b0e1 100644 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/PetApi.md +++ b/samples/client/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/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md index 256e46f5f157..24d03a779c54 100644 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/StoreApi.md +++ b/samples/client/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/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md b/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md index 6b14a5a4373f..e016a7a5e308 100644 --- a/samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/docs/UserApi.md +++ b/samples/client/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*