Skip to content

Commit 0802f94

Browse files
committed
Bug fix: some character replacement where done on the local directories
names. The dot character was replaced by the file separator on the whole paths, not only on the package name based part.
1 parent 21eb406 commit 0802f94

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ public void processOpts() {
104104
}
105105

106106
additionalProperties.put("clientPackage", clientPackage);
107-
107+
108108
supportingFiles.add(new SupportingFile("Configuration.mustache",
109-
(sourceFolder + File.separator + clientPackage).replace(".", java.io.File.separator), "Configuration.cs"));
109+
sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "Configuration.cs"));
110110
supportingFiles.add(new SupportingFile("ApiClient.mustache",
111-
(sourceFolder + File.separator + clientPackage).replace(".", java.io.File.separator), "ApiClient.cs"));
111+
sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "ApiClient.cs"));
112112
supportingFiles.add(new SupportingFile("ApiException.mustache",
113-
(sourceFolder + File.separator + clientPackage).replace(".", java.io.File.separator), "ApiException.cs"));
113+
sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "ApiException.cs"));
114114
supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll"));
115115
supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll"));
116116
supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
@@ -137,12 +137,11 @@ public String escapeReservedWord(String name) {
137137

138138
@Override
139139
public String apiFileFolder() {
140-
141-
return outputFolder + File.separator + (sourceFolder + File.separator + apiPackage()).replace('.', File.separatorChar);
140+
return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
142141
}
143142

144143
public String modelFileFolder() {
145-
return outputFolder + File.separator + (sourceFolder + File.separator + modelPackage()).replace('.', File.separatorChar);
144+
return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
146145
}
147146

148147
@Override

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ public void processOpts() {
108108
}
109109

110110
supportingFiles.add(new SupportingFile("Configuration.mustache",
111-
(sourceFolder + File.separator + clientPackage).replace(".", java.io.File.separator), "Configuration.cs"));
111+
sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "Configuration.cs"));
112112
supportingFiles.add(new SupportingFile("ApiClient.mustache",
113-
(sourceFolder + File.separator + clientPackage).replace(".", java.io.File.separator), "ApiClient.cs"));
113+
sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "ApiClient.cs"));
114114
supportingFiles.add(new SupportingFile("ApiException.mustache",
115-
(sourceFolder + File.separator + clientPackage).replace(".", java.io.File.separator), "ApiException.cs"));
115+
sourceFolder + File.separator + clientPackage.replace(".", java.io.File.separator), "ApiException.cs"));
116116
supportingFiles.add(new SupportingFile("packages.config.mustache", "vendor", "packages.config"));
117117
supportingFiles.add(new SupportingFile("compile-mono.sh.mustache", "", "compile-mono.sh"));
118118
supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
@@ -142,11 +142,11 @@ public String escapeReservedWord(String name) {
142142

143143
@Override
144144
public String apiFileFolder() {
145-
return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage()).replace('.', File.separatorChar);
145+
return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar);
146146
}
147147

148148
public String modelFileFolder() {
149-
return (outputFolder + File.separator + sourceFolder + File.separator + modelPackage()).replace('.', File.separatorChar);
149+
return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar);
150150
}
151151

152152
@Override

0 commit comments

Comments
 (0)