From 37184a1cd8914f7f11d910ec84a7677d4eb30ae3 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 5 Nov 2017 10:22:36 +0800
Subject: [PATCH] Minor fix to body parameter in required parameter list
 (#6885)

* minor fix to required parameter list

* better if then else block
---
 .../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..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
@@ -2227,17 +2227,7 @@ public class DefaultCodegen {
                     }
                 }
 
-                // 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 is<Type>Param flags
                 // from here to fromParameter().
                 if (param instanceof QueryParameter) {
@@ -2257,7 +2247,10 @@ public class DefaultCodegen {
                 } else if (param instanceof FormParameter) {
                     formParams.add(p.copy());
                 }
-                if (!p.required) {
+
+                if (p.required) { //required parameters
+                    requiredParams.add(p.copy());
+                } else { // optional parameters
                     op.hasOptionalParams = true;
                 }
             }