Revert "Change body serialization for complex type"

This reverts commit 3e34c16.
jianghaolu · May 17, 2016 · 6500965 · 6500965
1 parent 24cd72e
commit 6500965
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 62 deletions.
diff --git a/AutoRest/Generators/Python/Azure.Python/Templates/AzureLongRunningMethodTemplate.cshtml b/AutoRest/Generators/Python/Azure.Python/Templates/AzureLongRunningMethodTemplate.cshtml
@@ -64,32 +64,17 @@
       {
         @:body_content = upload_gen(@parameter.Name)
         break;
-            }
-        }
+      }
     }
-    else if (Model.RequestBody.IsRequired)
-    {
-
-        if (Model.RequestBody.Type is CompositeType)
-        {
-        @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
+  }
+  else if (Model.RequestBody.IsRequired)
+  {
         @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
-    }
-    else
-    {
+  }
+  else
+  {
         @:if @Model.RequestBody.Name is not None:
-            if (Model.RequestBody.Type is CompositeType)
-        {
-            @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
             @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
         @:else:
             @:body_content = None
   }

diff --git a/AutoRest/Generators/Python/Azure.Python/Templates/AzurePagingMethodTemplate.cshtml b/AutoRest/Generators/Python/Azure.Python/Templates/AzurePagingMethodTemplate.cshtml
@@ -59,27 +59,13 @@
 {
             @:# Construct body
   if (Model.RequestBody.IsRequired)
-    {
-        if (Model.RequestBody.Type is CompositeType)
-        {
-            @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
+  {
             @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
-    }
-    else
-    {
+  }
+  else
+  {
             @:if @Model.RequestBody.Name is not None:
-        if (Model.RequestBody.Type is CompositeType)
-        {
-                @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
                 @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
             @:else:
                 @:body_content = None
   }

diff --git a/AutoRest/Generators/Python/Python/Templates/MethodTemplate.cshtml b/AutoRest/Generators/Python/Python/Templates/MethodTemplate.cshtml
@@ -64,31 +64,17 @@
       {
         @:body_content = self._client.stream_upload(@parameter.Name, callback)
         break;
-            }
-        }
-    }
-    else if (Model.RequestBody.IsRequired)
-    {
-        if (Model.RequestBody.Type is CompositeType)
-        {
-        @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
+      }
+    }   
+  }
+  else if (Model.RequestBody.IsRequired)
+  {
         @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
-    }
-    else
-    {
+  }
+  else
+  {
         @:if @Model.RequestBody.Name is not None:
-        if (Model.RequestBody.Type is CompositeType)
-        {
-            @:body_content = self._serialize.body(@Model.RequestBody.Name, models.@(Model.RequestBody.Type.ToPythonRuntimeTypeString()))
-        }
-        else
-        {
             @:body_content = self._serialize.body(@Model.RequestBody.Name, '@(Model.RequestBody.Type.ToPythonRuntimeTypeString())')
-        }
         @:else:
             @:body_content = None
   }