Skip to content

Fix Bug with decimal literal in C# #1436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 9 commits into from
Feb 10, 2019
Merged

Fix Bug with decimal literal in C# #1436

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a270b98
Merge pull request #1 from OpenAPITools/master
Oct 25, 2018
b071881
Merge pull request #2 from OpenAPITools/master
Nov 6, 2018
8decf65
Trivial change to kick PR again
Nov 7, 2018
e6638bb
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
Nov 7, 2018
10d1c4e
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
Nov 13, 2018
19bee65
Fix issue 1433 (default decimal literal broken for C#)
Nov 13, 2018
ff851d4
Replace tab with space
Jan 25, 2019
3f5d574
update samples
wing328 Feb 9, 2019
77cfe53
Merge remote-tracking branch 'upstream2/master' into bug-1433-decimal…
wing328 Feb 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ protected File writeInputStreamToFile(String filename, InputStream in, String te
IOUtils.copy(in, out);
out.close();
} else {
LOGGER.error("can't open '" + templateFile + "' for input, can not write '" + filename + "'");
LOGGER.error("can't open '" + templateFile + "' for input; cannot write '" + filename + "'");
}
return outputFile;
}
Expand Down
4 changes: 2 additions & 2 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,8 @@ public String toDefaultValue(Schema p) {
return p.getDefault().toString() + "F";
} else if (ModelUtils.isDoubleSchema(p)) { // double
return p.getDefault().toString() + "D";
} else {
return p.getDefault().toString();
} else { // decimal
Copy link
Member

@wing328 wing328 Jan 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wheezil please use space instead of tab

Copy link
Contributor Author

@wheezil wheezil Jan 25, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, should be GTG now.
PS: I'll be back to this project pretty soon, just got assigned to some other stuff for a while. I appreciate you keeping my PR moving.

return p.getDefault().toString() + "M";
}
}
} else if (ModelUtils.isIntegerSchema(p)) {
Expand Down
3 changes: 0 additions & 3 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,6 @@ public static boolean isFloatSchema(Schema schema) {
}

public static boolean isDoubleSchema(Schema schema) {
if (schema instanceof NumberSchema) {
return true;
}
if (SchemaTypeUtil.NUMBER_TYPE.equals(schema.getType())
&& SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat())) { // format: double
return true;
Expand Down