Generated jobs: Don't dump empty strings to body parameters

This is important for (soon to be added) LoginJob, since the server is
sensitive to getting an (even empty) entity for "medium" as opposed to
omitting it entirely. This cannot be addressed on the spec level; on the
other hand, removing empty parameters from the payload reduces useless
bytes getting on the wire.

1 files changed, 7 insertions, 6 deletions

diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache
index 45668d4c..f3a6dc59 100644
--- a/jobs/{{base}}.cpp.mustache
+++ b/jobs/{{base}}.cpp.mustache
@@ -39,13 +39,14 @@ class {{camelCaseOperationId}}Job::Private
         Query {{^queryParams}}{ }{{/queryParams}}{{#queryParams?}}{
             {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}},
             {{/hasMore}}{{/queryParams}}
-        }{{/queryParams?}},
-        Data {{^bodyParams}}{ }{{/bodyParams}}{{#bodyParams?}}{
-            {{#bodyParams}}{ "{{baseName}}", toJson({{paramName}}) }{{#hasMore}},
-            {{/hasMore}}{{/bodyParams}}
-        }{{/bodyParams?}}{{#skipAuth}}, false{{/skipAuth}}
+        }{{/queryParams?}}{{#skipAuth}}, Data { }, false{{/skipAuth}}
     ){{#responses}}{{#normalResponse?}}{{#properties?}}, d(new Private){{/properties?}}{{/normalResponse?}}{{/responses}}
-{ }
+{{#bodyParams?}}{
+    Data _data;{{#bodyParams}}
+{{^required?}}{{#string?}}    if (!{{paramName}}.isEmpty())
+    {{/string?}}{{/required?}}    _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}}
+    setRequestData(_data);
+}{{/bodyParams?}}{{^bodyParams?}}{ }{{/bodyParams?}}
 {{#    responses}}{{#normalResponse?}}{{#properties?}}
 {{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job()
 {