Merge pull request #785 from wing328/csharp_add_restsharp_dll

[C#] Added RestSharp.dll and updated compile.bat
This commit is contained in:
Tony Tam 2015-06-05 00:38:05 -07:00
commit b41e88e83a
6 changed files with 14 additions and 9 deletions

View File

@ -46,6 +46,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
supportingFiles.add(new SupportingFile("apiException.mustache", supportingFiles.add(new SupportingFile("apiException.mustache",
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.cs")); (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.cs"));
supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll")); supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll"));
supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll"));
supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat")); supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
languageSpecificPrimitives = new HashSet<String>( languageSpecificPrimitives = new HashSet<String>(
@ -59,7 +60,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
"byte[]", "byte[]",
"List", "List",
"Dictionary", "Dictionary",
"DateTime", "DateTime?",
"String", "String",
"Boolean", "Boolean",
"Double", "Double",
@ -79,9 +80,11 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
typeMapping.put("long", "long?"); typeMapping.put("long", "long?");
typeMapping.put("double", "double?"); typeMapping.put("double", "double?");
typeMapping.put("number", "double?"); typeMapping.put("number", "double?");
typeMapping.put("Date", "DateTime"); typeMapping.put("datetime", "DateTime?");
typeMapping.put("date", "DateTime?");
typeMapping.put("file", "string"); // path to file typeMapping.put("file", "string"); // path to file
typeMapping.put("array", "List"); typeMapping.put("array", "List");
typeMapping.put("list", "List");
typeMapping.put("map", "Dictionary"); typeMapping.put("map", "Dictionary");
typeMapping.put("object", "Object"); typeMapping.put("object", "Object");
@ -94,11 +97,11 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
@Override @Override
public String apiFileFolder() { public String apiFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', '/')).replace('.', File.separatorChar);
} }
public String modelFileFolder() { public String modelFileFolder() {
return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', '/')).replace('.', File.separatorChar);
} }
@Override @Override
@ -165,8 +168,8 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
public String getSwaggerType(Property p) { public String getSwaggerType(Property p) {
String swaggerType = super.getSwaggerType(p); String swaggerType = super.getSwaggerType(p);
String type = null; String type = null;
if(typeMapping.containsKey(swaggerType)) { if(typeMapping.containsKey(swaggerType.toLowerCase())) {
type = typeMapping.get(swaggerType); type = typeMapping.get(swaggerType.toLowerCase());
if(languageSpecificPrimitives.contains(type)) if(languageSpecificPrimitives.contains(type))
return type; return type;
} }

View File

@ -1,2 +1,3 @@
SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319 SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/{{invokerPackage}}.dll /recurse:src\*.cs /doc:bin/{{invokerPackage}}.xml %CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/{{invokerPackage}}.dll /recurse:src\*.cs /doc:bin/{{invokerPackage}}.xml

Binary file not shown.

View File

@ -1,2 +1,3 @@
SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319 SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/IO.Swagger.Client.dll /recurse:src\*.cs /doc:bin/IO.Swagger.Client.xml %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

View File

@ -25,7 +25,7 @@ namespace IO.Swagger.Model {
[DataMember(Name="shipDate", EmitDefaultValue=false)] [DataMember(Name="shipDate", EmitDefaultValue=false)]
public DateTime ShipDate { get; set; } public DateTime? ShipDate { get; set; }
/* Order Status */ /* Order Status */