Skip to content
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

Better handling of operationID starting with numbers #691

Merged
merged 12 commits into from
Aug 1, 2018
+443 −419
Merged

Better handling of operationID starting with numbers #691

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5be1ef1
add numeric operationid to test spec
wing328 Jul 30, 2018
acfbf93
better handling of operationId in more generators
wing328 Jul 30, 2018
c594079
fix go toOperationId
wing328 Jul 30, 2018
a1f26ef
update samples
wing328 Jul 30, 2018
4b0fa8b
update java samples
wing328 Jul 31, 2018
f240570
update java samples (vertx, webclient)
wing328 Jul 31, 2018
1648871
update java google api client sample
wing328 Jul 31, 2018
0257626
fix typo, update OAS3 test spec, update php petstore (oas3)
wing328 Jul 31, 2018
c18634e
defer camelize in operationid
wing328 Aug 1, 2018
6cb657a
remove duplicated sanitizeName
wing328 Aug 1, 2018
7e5e6c7
Merge remote-tracking branch 'origin/master' into operationid_number
wing328 Aug 1, 2018
5484bfd
Merge remote-tracking branch 'origin/master' into operationid_number
wing328 Aug 1, 2018
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
Prev Previous commit
Next Next commit
defer camelize in operationid
@wing328
wing328 committed Aug 1, 2018
commit c18634e0030411e12aa59c8a7b24a3a4d8505a5e
2 changes: 1 addition & 1 deletion ...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
View file
Original file line number Diff line number Diff line change
@@ -606,7 +606,7 @@ public String toOperationId(String operationId) {
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId)));
operationId = camelize("call_" + operationId);
operationId = "call_" + operationId;
Copy link
Contributor

Choose a reason for hiding this comment

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

still not sanitizing here

Copy link
Member

Choose a reason for hiding this comment

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

I am not sure to understand, this is just about adding the call_ prefix. The value will be sanitized on line 612: return camelize(sanitizeName(operationId));

Copy link
Contributor

Choose a reason for hiding this comment

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

oh my bad, didnt see that

Copy link
Member Author

Choose a reason for hiding this comment

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

@jmini is correct. It was already sanitized a few lines above and that's the reason why I didn't call the function sanitize again when the operationId starts with a number.

}

return camelize(sanitizeName(operationId));