From d9fd2f3ce86b3def91267a909a5e7b7dd60fadf5 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 5 Nov 2017 00:03:26 +0800 Subject: [PATCH 1/2] minor fix to required parameter list --- .../java/io/swagger/codegen/DefaultCodegen.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index 57f30806e2e..c4caaf253f9 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -2227,17 +2227,7 @@ public CodegenOperation fromOperation(String path, } } - // set isPrimitiveType and baseType for allParams - /*if (languageSpecificPrimitives.contains(p.baseType)) { - p.isPrimitiveType = true; - p.baseType = getSwaggerType(p); - }*/ - - allParams.add(p); - if (p.required || p.isBodyParam) { - requiredParams.add(p.copy()); - } // Issue #2561 (neilotoole) : Moved setting of isParam flags // from here to fromParameter(). if (param instanceof QueryParameter) { @@ -2257,8 +2247,11 @@ public CodegenOperation fromOperation(String path, } else if (param instanceof FormParameter) { formParams.add(p.copy()); } - if (!p.required) { + + if (!p.required) { //optional parameters op.hasOptionalParams = true; + } else { // reuqired parameters + requiredParams.add(p.copy()); } } } From edcf7a538f7bab6ee0b297a00f7bf73203692511 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 5 Nov 2017 01:34:33 +0800 Subject: [PATCH 2/2] better if then else block --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index c4caaf253f9..8b3655000bb 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -2248,10 +2248,10 @@ public CodegenOperation fromOperation(String path, formParams.add(p.copy()); } - if (!p.required) { //optional parameters - op.hasOptionalParams = true; - } else { // reuqired parameters + if (p.required) { //required parameters requiredParams.add(p.copy()); + } else { // optional parameters + op.hasOptionalParams = true; } } }