Skip to content

Issue 10516 #10576

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
HugoMario merged 2 commits into from
Nov 22, 2020
Merged

Issue 10516 #10576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9157540
fixed javascript generation issue.
HugoMario Nov 22, 2020
4b01fc2
fixed override method
HugoMario Nov 22, 2020
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
10 changes: 9 additions & 1 deletion ...s/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
public CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions) {
CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);

if (allDefinitions != null && codegenModel != null && codegenModel.parent != null && codegenModel.hasEnums) {
if (allDefinitions != null && codegenModel != null && codegenModel.parent != null && codegenModel.hasEnums && codegenModel.parentSchema != null) {
final Model parentModel = allDefinitions.get(codegenModel.parentSchema);
final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel, allDefinitions);
codegenModel = JavascriptClientCodegen.reconcileInlineEnums(codegenModel, parentCodegenModel);
Expand All @@ -900,6 +900,14 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
return codegenModel;
}

@Override
protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, ModelImpl swaggerModel) {
super.addAdditionPropertiesToCodeGenModel(codegenModel, swaggerModel);
if (swaggerModel.getAdditionalProperties() != null) {
codegenModel.additionalPropertiesType = getSwaggerType(swaggerModel.getAdditionalProperties());
}
}

private String sanitizePath(String p) {
//prefer replace a ', instead of a fuLL URL encode for readability
return p.replaceAll("'", "%27");
Expand Down
4 changes: 4 additions & 0 deletions modules/swagger-codegen/src/main/resources/Javascript/partial_model_generic.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@
exports.prototype.{{name}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}undefined{{/defaultValue}};

{{/vars}}
{{#additionalPropertiesType}}
exports.prototype.additionalProperties = new Map();
{{/additionalPropertiesType}}

{{#useInheritance}}
{{#interfaceModels}}
// Implement {{classname}} interface:
Expand Down