Skip to content

Commit b41e88e

Browse files
committed
Merge pull request #785 from wing328/csharp_add_restsharp_dll
[C#] Added RestSharp.dll and updated compile.bat
2 parents cbc4da5 + 61bc652 commit b41e88e

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public CSharpClientCodegen() {
4646
supportingFiles.add(new SupportingFile("apiException.mustache",
4747
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.cs"));
4848
supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll"));
49+
supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll"));
4950
supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
5051

5152
languageSpecificPrimitives = new HashSet<String>(
@@ -59,7 +60,7 @@ public CSharpClientCodegen() {
5960
"byte[]",
6061
"List",
6162
"Dictionary",
62-
"DateTime",
63+
"DateTime?",
6364
"String",
6465
"Boolean",
6566
"Double",
@@ -79,9 +80,11 @@ public CSharpClientCodegen() {
7980
typeMapping.put("long", "long?");
8081
typeMapping.put("double", "double?");
8182
typeMapping.put("number", "double?");
82-
typeMapping.put("Date", "DateTime");
83+
typeMapping.put("datetime", "DateTime?");
84+
typeMapping.put("date", "DateTime?");
8385
typeMapping.put("file", "string"); // path to file
8486
typeMapping.put("array", "List");
87+
typeMapping.put("list", "List");
8588
typeMapping.put("map", "Dictionary");
8689
typeMapping.put("object", "Object");
8790

@@ -94,11 +97,11 @@ public String escapeReservedWord(String name) {
9497

9598
@Override
9699
public String apiFileFolder() {
97-
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
100+
return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', '/')).replace('.', File.separatorChar);
98101
}
99102

100103
public String modelFileFolder() {
101-
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
104+
return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', '/')).replace('.', File.separatorChar);
102105
}
103106

104107
@Override
@@ -165,8 +168,8 @@ else if (p instanceof MapProperty) {
165168
public String getSwaggerType(Property p) {
166169
String swaggerType = super.getSwaggerType(p);
167170
String type = null;
168-
if(typeMapping.containsKey(swaggerType)) {
169-
type = typeMapping.get(swaggerType);
171+
if(typeMapping.containsKey(swaggerType.toLowerCase())) {
172+
type = typeMapping.get(swaggerType.toLowerCase());
170173
if(languageSpecificPrimitives.contains(type))
171174
return type;
172175
}
147 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
2-
%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/{{invokerPackage}}.dll /recurse:src\*.cs /doc:bin/{{invokerPackage}}.xml
2+
%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/{{invokerPackage}}.dll /recurse:src\*.cs /doc:bin/{{invokerPackage}}.xml
3+
147 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
2-
%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/IO.Swagger.Client.dll /recurse:src\*.cs /doc:bin/IO.Swagger.Client.xml
2+
%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/IO.Swagger.Client.dll /recurse:src\*.cs /doc:bin/IO.Swagger.Client.xml
3+

samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Order {
2525

2626

2727
[DataMember(Name="shipDate", EmitDefaultValue=false)]
28-
public DateTime ShipDate { get; set; }
28+
public DateTime? ShipDate { get; set; }
2929

3030

3131
/* Order Status */

0 commit comments

Comments
 (0)