loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[csharp] Fixed isMap property (#13482)

Browse Source 
* fixed data type for maps

* fighting line endings

* fighting line endings

* removed commented code

* reverted unintended line break

* reverted unintended line break

* reverted unintended line break
This commit is contained in:
devhl-labs 2022-09-26 23:10:10 -04:00 committed by GitHub
parent 36976d5c72
commit 4e54b07076
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
View File

@ -118,7 +118,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
);
mapTypes = new HashSet<>(
Arrays.asList("IDictionary")
Arrays.asList("IDictionary", "Dictionary")
);
// NOTE: C# uses camel cased reserved words, while models are title cased. We don't want lowercase comparisons.
@ -712,7 +712,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
}
} else {
operation.returnContainer = operation.returnType;
operation.isMap = this.mapTypes.contains(typeMapping);
operation.isMap = this.mapTypes.stream().anyMatch(t -> typeMapping.startsWith(t));
}
}

4
modules/openapi-generator/src/main/resources/aspnetcore/2.0/mapReturn.mustache vendored
View File

@ -1,4 +1,4 @@
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<{{{returnType}}}>>(exampleJson)
: new Dictionary<{{{returnType}}}>();
? JsonConvert.DeserializeObject<{{{returnType}}}>(exampleJson)
: new {{{returnType}}}();

4
modules/openapi-generator/src/main/resources/aspnetcore/2.1/mapReturn.mustache vendored
View File

@ -1,4 +1,4 @@
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<{{{returnType}}}>>(exampleJson)
: new Dictionary<{{{returnType}}}>();
? JsonConvert.DeserializeObject<{{{returnType}}}>(exampleJson)
: new {{{returnType}}}();

4
modules/openapi-generator/src/main/resources/aspnetcore/3.0/mapReturn.mustache vendored
View File

@ -1,4 +1,4 @@
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<{{{returnType}}}>>(exampleJson)
: new Dictionary<{{{returnType}}}>();
? JsonConvert.DeserializeObject<{{{returnType}}}>(exampleJson)
: new {{{returnType}}}();

2
samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
View File

@ -70,7 +70,7 @@ namespace Org.OpenAPITools.Controllers
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<string, int>>(exampleJson)
: default(Dictionary<string, int>);
: new Dictionary<string, int>();
//TODO: Change the data returned
return new ObjectResult(example);
}

2
samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs
View File

@ -70,7 +70,7 @@ namespace Org.OpenAPITools.Controllers
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<string, int>>(exampleJson)
: default(Dictionary<string, int>);
: new Dictionary<string, int>();
//TODO: Change the data returned
return new ObjectResult(example);
}

2
samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
View File

@ -70,7 +70,7 @@ namespace Org.OpenAPITools.Controllers
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<string, int>>(exampleJson)
: default(Dictionary<string, int>);
: new Dictionary<string, int>();
//TODO: Change the data returned
return new ObjectResult(example);
}

2
samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs
View File

@ -70,7 +70,7 @@ namespace Org.OpenAPITools.Controllers
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<string, int>>(exampleJson)
: default(Dictionary<string, int>);
: new Dictionary<string, int>();
//TODO: Change the data returned
return new ObjectResult(example);
}

2
samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs
View File

@ -70,7 +70,7 @@ namespace Org.OpenAPITools.Controllers
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<string, int>>(exampleJson)
: default(Dictionary<string, int>);
: new Dictionary<string, int>();
//TODO: Change the data returned
return new ObjectResult(example);
}

2
samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs
View File

@ -70,7 +70,7 @@ namespace Org.OpenAPITools.Controllers
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<string, int>>(exampleJson)
: default(Dictionary<string, int>);
: new Dictionary<string, int>();
//TODO: Change the data returned
return new ObjectResult(example);
}

2
samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs
View File

@ -70,7 +70,7 @@ namespace Org.OpenAPITools.Controllers
var example = exampleJson != null
? JsonConvert.DeserializeObject<Dictionary<string, int>>(exampleJson)
: default(Dictionary<string, int>);
: new Dictionary<string, int>();
//TODO: Change the data returned
return new ObjectResult(example);
}