fix-empty-object-default-value for issue #676

Azure · Dec 14, 2020 · ac88afe · ac88afe
1 parent 4818d70
commit ac88afe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/plugins/azgenerator/CodeModelAzImpl.ts b/src/plugins/azgenerator/CodeModelAzImpl.ts
@@ -1629,7 +1629,6 @@ export class CodeModelCliImpl implements CodeModelAz {
             // Handle complex
             let shouldHidden = undefined;
             let defaultValue = undefined;
-            let hasDefault = false;
             if (this.EnterSubMethodParameters(parameter)) {
                 shouldHidden = true;
                 defaultValue = "{";
@@ -1642,11 +1641,10 @@ export class CodeModelCliImpl implements CodeModelAz {
                         }
                         else if (this.Parameter_Type(this.SubMethodParameter) == SchemaType.Constant) {
                             defaultValue = defaultValue + "\"" + this.Parameter_NameAz(this.SubMethodParameter) + "\": \"" + this.Parameter_DefaultValue(this.SubMethodParameter) + "\"";
-                            hasDefault = true;
                         }
                     } while (this.SelectNextMethodParameter())
                 }
-                if (shouldHidden == true && hasDefault) {
+                if (shouldHidden == true) {
                     defaultValue = defaultValue + "}";
                 }
                 else {

diff --git a/src/plugins/azgenerator/templates/generated/CliCustom.ts b/src/plugins/azgenerator/templates/generated/CliCustom.ts
@@ -163,6 +163,9 @@ function ConstructMethodBodyParameter(model: CodeModelAz, needGeneric: boolean =
                     }
                     else {
                         let defaultValue = ToPythonString(model.MethodParameter_DefaultValue, model.MethodParameter_Type);
+                        if (model.MethodParameter_DefaultValue == "{}") {
+                            defaultValue = "{}";
+                        }
                         if (!model.MethodParameter_IsHidden) {
                             let needIfClause = true;
                             if (model.MethodParameter_Type == SchemaType.Constant) {
@@ -171,7 +174,7 @@ function ConstructMethodBodyParameter(model: CodeModelAz, needGeneric: boolean =
                             access = ConstructValuation(model, required, needGeneric, prefixIndent, originalParameterNameStack, paramName, model.MethodParameter_MapsTo, defaultValue, needIfClause);
                         } 
                         else if (!isNullOrUndefined(model.MethodParameter_DefaultValue)) {
-                            if (model.isComplexSchema(model.MethodParameter_Type)) {
+                            if (model.isComplexSchema(model.MethodParameter_Type) && defaultValue != "{}") {
                                 defaultValue = "json.loads(" + defaultValue + ")";
                                 required['json'] = true;
                             }