Skip to content

Commit f45c165

Browse files
committed
fixed the extra comma on controllers arguments when cookie params are present.
1 parent 52f95a9 commit f45c165

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2932,7 +2932,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
29322932
co.baseName = tag;
29332933
}
29342934

2935-
private void addParentContainer(CodegenModel codegenModel, String name, Schema schema) {
2935+
protected void addParentContainer(CodegenModel codegenModel, String name, Schema schema) {
29362936
final CodegenProperty codegenProperty = fromProperty(name, schema);
29372937
addImport(codegenModel, codegenProperty.complexType);
29382938
codegenModel.parent = toInstantiationType(schema);
@@ -4194,12 +4194,7 @@ protected void configuresParameterForMediaType(CodegenOperation codegenOperation
41944194
codegenOperation.getContents().add(content);
41954195
return;
41964196
}
4197-
for (CodegenContent content : codegenContents) {
4198-
addParemeters(content, codegenOperation.headerParams);
4199-
addParemeters(content, codegenOperation.queryParams);
4200-
addParemeters(content, codegenOperation.pathParams);
4201-
addParemeters(content, codegenOperation.cookieParams);
4202-
}
4197+
this.addCodegenContentParemeters(codegenOperation, codegenContents);
42034198
for (CodegenContent content : codegenContents) {
42044199
Collections.sort(content.getParameters(), (CodegenParameter one, CodegenParameter another) -> {
42054200
if (one.required == another.required){
@@ -4226,6 +4221,15 @@ protected void addParemeters(CodegenContent codegenContent, List<CodegenParamete
42264221
}
42274222
}
42284223

4224+
protected void addCodegenContentParemeters(CodegenOperation codegenOperation, List<CodegenContent> codegenContents) {
4225+
for (CodegenContent content : codegenContents) {
4226+
addParemeters(content, codegenOperation.headerParams);
4227+
addParemeters(content, codegenOperation.queryParams);
4228+
addParemeters(content, codegenOperation.pathParams);
4229+
addParemeters(content, codegenOperation.cookieParams);
4230+
}
4231+
}
4232+
42294233
protected void setParameterNullable(CodegenParameter parameter, CodegenProperty property) {
42304234
parameter.nullable = property.nullable;
42314235
}

src/main/java/io/swagger/codegen/v3/generators/dotnet/AbstractCSharpCodegen.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import com.github.jknack.handlebars.Lambda;
55
import com.google.common.collect.ImmutableMap;
66
import io.swagger.codegen.v3.CodegenConstants;
7+
import io.swagger.codegen.v3.CodegenContent;
78
import io.swagger.codegen.v3.CodegenModel;
89
import io.swagger.codegen.v3.CodegenOperation;
910
import io.swagger.codegen.v3.CodegenProperty;
11+
import io.swagger.codegen.v3.ISchemaHandler;
1012
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
1113
import io.swagger.codegen.v3.generators.handlebars.csharp.CsharpHelper;
1214
import io.swagger.codegen.v3.generators.handlebars.lambda.CamelCaseLambda;
@@ -1067,6 +1069,20 @@ public void addHandlebarHelpers(Handlebars handlebars) {
10671069
handlebars.registerHelpers(new CsharpHelper());
10681070
}
10691071

1072+
@Override
1073+
protected void addCodegenContentParemeters(CodegenOperation codegenOperation, List<CodegenContent> codegenContents) {
1074+
for (CodegenContent content : codegenContents) {
1075+
addParemeters(content, codegenOperation.headerParams);
1076+
addParemeters(content, codegenOperation.queryParams);
1077+
addParemeters(content, codegenOperation.pathParams);
1078+
}
1079+
}
1080+
1081+
@Override
1082+
public ISchemaHandler getSchemaHandler() {
1083+
return new DotNetSchemaHandler(this);
1084+
}
1085+
10701086
/*
10711087
TODO: uncomment if/when switching to stream for file upload
10721088
@Override

0 commit comments

Comments
 (0)