@aws-sdk/client-dataexchange 3.141.0 → 3.150.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,10 +1,10 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest, isValidHostname as __isValidHostname, } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseRfc3339DateTime as __parseRfc3339DateTime, } from "@aws-sdk/smithy-client";
+import { convertMap, decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, limitedParseDouble as __limitedParseDouble, map as __map, parseRfc3339DateTime as __parseRfc3339DateTime, resolvedPath as __resolvedPath, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { DataExchangeServiceException as __BaseException } from "../models/DataExchangeServiceException";
 import { AccessDeniedException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceLimitExceededException, ThrottlingException, ValidationException, } from "../models/models_0";
 export var serializeAws_restJson1CancelJobCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -12,16 +12,7 @@ export var serializeAws_restJson1CancelJobCommand = function (input, context) {
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/jobs/{JobId}";
-                if (input.JobId !== undefined) {
-                    labelValue = input.JobId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: JobId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{JobId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: JobId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "JobId", function () { return input.JobId; }, "{JobId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -107,7 +98,7 @@ export var serializeAws_restJson1CreateJobCommand = function (input, context) {
     });
 }); };
 export var serializeAws_restJson1CreateRevisionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -117,16 +108,7 @@ export var serializeAws_restJson1CreateRevisionCommand = function (input, contex
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/data-sets/{DataSetId}/revisions";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.Comment != null && { Comment: input.Comment })), (input.Tags != null && { Tags: serializeAws_restJson1MapOf__string(input.Tags, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -141,7 +123,7 @@ export var serializeAws_restJson1CreateRevisionCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1DeleteAssetCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -150,36 +132,9 @@ export var serializeAws_restJson1DeleteAssetCommand = function (input, context)
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}";
-                if (input.AssetId !== undefined) {
-                    labelValue = input.AssetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: AssetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{AssetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: AssetId.");
-                }
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                if (input.RevisionId !== undefined) {
-                    labelValue = input.RevisionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: RevisionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{RevisionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: RevisionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "AssetId", function () { return input.AssetId; }, "{AssetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "RevisionId", function () { return input.RevisionId; }, "{RevisionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -193,7 +148,7 @@ export var serializeAws_restJson1DeleteAssetCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1DeleteDataSetCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -201,16 +156,7 @@ export var serializeAws_restJson1DeleteDataSetCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/data-sets/{DataSetId}";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -224,7 +170,7 @@ export var serializeAws_restJson1DeleteDataSetCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1DeleteEventActionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -232,16 +178,7 @@ export var serializeAws_restJson1DeleteEventActionCommand = function (input, con
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/event-actions/{EventActionId}";
-                if (input.EventActionId !== undefined) {
-                    labelValue = input.EventActionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: EventActionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{EventActionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: EventActionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "EventActionId", function () { return input.EventActionId; }, "{EventActionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -255,7 +192,7 @@ export var serializeAws_restJson1DeleteEventActionCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1DeleteRevisionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -264,26 +201,8 @@ export var serializeAws_restJson1DeleteRevisionCommand = function (input, contex
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/data-sets/{DataSetId}/revisions/{RevisionId}";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                if (input.RevisionId !== undefined) {
-                    labelValue = input.RevisionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: RevisionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{RevisionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: RevisionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "RevisionId", function () { return input.RevisionId; }, "{RevisionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -297,7 +216,7 @@ export var serializeAws_restJson1DeleteRevisionCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1GetAssetCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -306,36 +225,9 @@ export var serializeAws_restJson1GetAssetCommand = function (input, context) { r
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}";
-                if (input.AssetId !== undefined) {
-                    labelValue = input.AssetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: AssetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{AssetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: AssetId.");
-                }
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                if (input.RevisionId !== undefined) {
-                    labelValue = input.RevisionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: RevisionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{RevisionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: RevisionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "AssetId", function () { return input.AssetId; }, "{AssetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "RevisionId", function () { return input.RevisionId; }, "{RevisionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -349,7 +241,7 @@ export var serializeAws_restJson1GetAssetCommand = function (input, context) { r
     });
 }); };
 export var serializeAws_restJson1GetDataSetCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -357,16 +249,7 @@ export var serializeAws_restJson1GetDataSetCommand = function (input, context) {
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/data-sets/{DataSetId}";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -380,7 +263,7 @@ export var serializeAws_restJson1GetDataSetCommand = function (input, context) {
     });
 }); };
 export var serializeAws_restJson1GetEventActionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -388,16 +271,7 @@ export var serializeAws_restJson1GetEventActionCommand = function (input, contex
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/event-actions/{EventActionId}";
-                if (input.EventActionId !== undefined) {
-                    labelValue = input.EventActionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: EventActionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{EventActionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: EventActionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "EventActionId", function () { return input.EventActionId; }, "{EventActionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -411,7 +285,7 @@ export var serializeAws_restJson1GetEventActionCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1GetJobCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -419,16 +293,7 @@ export var serializeAws_restJson1GetJobCommand = function (input, context) { ret
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/jobs/{JobId}";
-                if (input.JobId !== undefined) {
-                    labelValue = input.JobId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: JobId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{JobId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: JobId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "JobId", function () { return input.JobId; }, "{JobId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -442,7 +307,7 @@ export var serializeAws_restJson1GetJobCommand = function (input, context) { ret
     });
 }); };
 export var serializeAws_restJson1GetRevisionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -451,26 +316,8 @@ export var serializeAws_restJson1GetRevisionCommand = function (input, context)
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/data-sets/{DataSetId}/revisions/{RevisionId}";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                if (input.RevisionId !== undefined) {
-                    labelValue = input.RevisionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: RevisionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{RevisionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: RevisionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "RevisionId", function () { return input.RevisionId; }, "{RevisionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -484,7 +331,7 @@ export var serializeAws_restJson1GetRevisionCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1ListDataSetRevisionsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -492,17 +339,11 @@ export var serializeAws_restJson1ListDataSetRevisionsCommand = function (input,
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/data-sets/{DataSetId}/revisions";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -525,7 +366,11 @@ export var serializeAws_restJson1ListDataSetsCommand = function (input, context)
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/data-sets";
-                query = __assign(__assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken })), (input.Origin !== undefined && { origin: input.Origin }));
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                    origin: [, input.Origin],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -548,7 +393,11 @@ export var serializeAws_restJson1ListEventActionsCommand = function (input, cont
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/event-actions";
-                query = __assign(__assign(__assign({}, (input.EventSourceId !== undefined && { eventSourceId: input.EventSourceId })), (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                query = map({
+                    eventSourceId: [, input.EventSourceId],
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -571,7 +420,12 @@ export var serializeAws_restJson1ListJobsCommand = function (input, context) { r
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/jobs";
-                query = __assign(__assign(__assign(__assign({}, (input.DataSetId !== undefined && { dataSetId: input.DataSetId })), (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken })), (input.RevisionId !== undefined && { revisionId: input.RevisionId }));
+                query = map({
+                    dataSetId: [, input.DataSetId],
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                    revisionId: [, input.RevisionId],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -586,7 +440,7 @@ export var serializeAws_restJson1ListJobsCommand = function (input, context) { r
     });
 }); };
 export var serializeAws_restJson1ListRevisionAssetsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -595,27 +449,12 @@ export var serializeAws_restJson1ListRevisionAssetsCommand = function (input, co
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                if (input.RevisionId !== undefined) {
-                    labelValue = input.RevisionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: RevisionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{RevisionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: RevisionId.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "RevisionId", function () { return input.RevisionId; }, "{RevisionId}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -630,7 +469,7 @@ export var serializeAws_restJson1ListRevisionAssetsCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1ListTagsForResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -638,16 +477,7 @@ export var serializeAws_restJson1ListTagsForResourceCommand = function (input, c
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/tags/{ResourceArn}";
-                if (input.ResourceArn !== undefined) {
-                    labelValue = input.ResourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ResourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ResourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ResourceArn", function () { return input.ResourceArn; }, "{ResourceArn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -661,7 +491,7 @@ export var serializeAws_restJson1ListTagsForResourceCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1RevokeRevisionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -672,26 +502,8 @@ export var serializeAws_restJson1RevokeRevisionCommand = function (input, contex
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/revoke";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                if (input.RevisionId !== undefined) {
-                    labelValue = input.RevisionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: RevisionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{RevisionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: RevisionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "RevisionId", function () { return input.RevisionId; }, "{RevisionId}", false);
                 body = JSON.stringify(__assign({}, (input.RevocationComment != null && { RevocationComment: input.RevocationComment })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -712,13 +524,13 @@ export var serializeAws_restJson1SendApiAssetCommand = function (input, context)
             case 0: return [4, context.endpoint()];
             case 1:
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
-                headers = __assign(__assign(__assign(__assign(__assign(__assign({ "content-type": "text/plain" }, (isSerializableHeaderValue(input.AssetId) && { "x-amzn-dataexchange-asset-id": input.AssetId })), (isSerializableHeaderValue(input.DataSetId) && { "x-amzn-dataexchange-data-set-id": input.DataSetId })), (isSerializableHeaderValue(input.Method) && { "x-amzn-dataexchange-http-method": input.Method })), (isSerializableHeaderValue(input.Path) && { "x-amzn-dataexchange-path": input.Path })), (isSerializableHeaderValue(input.RevisionId) && { "x-amzn-dataexchange-revision-id": input.RevisionId })), (input.RequestHeaders !== undefined &&
+                headers = map({}, isSerializableHeaderValue, __assign({ "content-type": "text/plain", "x-amzn-dataexchange-asset-id": input.AssetId, "x-amzn-dataexchange-data-set-id": input.DataSetId, "x-amzn-dataexchange-http-method": input.Method, "x-amzn-dataexchange-path": input.Path, "x-amzn-dataexchange-revision-id": input.RevisionId }, (input.RequestHeaders !== undefined &&
                     Object.keys(input.RequestHeaders).reduce(function (acc, suffix) {
                         var _a;
                         return (__assign(__assign({}, acc), (_a = {}, _a["x-amzn-dataexchange-header-".concat(suffix.toLowerCase())] = input.RequestHeaders[suffix], _a)));
-                    }, {})));
+                    }, {}))));
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1";
-                query = __assign({}, (input.QueryStringParameters !== undefined && input.QueryStringParameters));
+                query = map(__assign({}, convertMap(input.QueryStringParameters)));
                 if (input.Body !== undefined) {
                     body = input.Body;
                 }
@@ -745,7 +557,7 @@ export var serializeAws_restJson1SendApiAssetCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1StartJobCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -753,16 +565,7 @@ export var serializeAws_restJson1StartJobCommand = function (input, context) { r
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/jobs/{JobId}";
-                if (input.JobId !== undefined) {
-                    labelValue = input.JobId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: JobId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{JobId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: JobId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "JobId", function () { return input.JobId; }, "{JobId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -776,7 +579,7 @@ export var serializeAws_restJson1StartJobCommand = function (input, context) { r
     });
 }); };
 export var serializeAws_restJson1TagResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -786,16 +589,7 @@ export var serializeAws_restJson1TagResourceCommand = function (input, context)
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/tags/{ResourceArn}";
-                if (input.ResourceArn !== undefined) {
-                    labelValue = input.ResourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ResourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ResourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ResourceArn", function () { return input.ResourceArn; }, "{ResourceArn}", false);
                 body = JSON.stringify(__assign({}, (input.Tags != null && { tags: serializeAws_restJson1MapOf__string(input.Tags, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -810,7 +604,7 @@ export var serializeAws_restJson1TagResourceCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1UntagResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -818,17 +612,10 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/tags/{ResourceArn}";
-                if (input.ResourceArn !== undefined) {
-                    labelValue = input.ResourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ResourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ResourceArn.");
-                }
-                query = __assign({}, (input.TagKeys !== undefined && { tagKeys: (input.TagKeys || []).map(function (_entry) { return _entry; }) }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ResourceArn", function () { return input.ResourceArn; }, "{ResourceArn}", false);
+                query = map({
+                    tagKeys: [function () { return input.TagKeys !== void 0; }, function () { return (input.TagKeys || []).map(function (_entry) { return _entry; }); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -843,7 +630,7 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1UpdateAssetCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -854,36 +641,9 @@ export var serializeAws_restJson1UpdateAssetCommand = function (input, context)
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}";
-                if (input.AssetId !== undefined) {
-                    labelValue = input.AssetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: AssetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{AssetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: AssetId.");
-                }
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                if (input.RevisionId !== undefined) {
-                    labelValue = input.RevisionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: RevisionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{RevisionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: RevisionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "AssetId", function () { return input.AssetId; }, "{AssetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "RevisionId", function () { return input.RevisionId; }, "{RevisionId}", false);
                 body = JSON.stringify(__assign({}, (input.Name != null && { Name: input.Name })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -898,7 +658,7 @@ export var serializeAws_restJson1UpdateAssetCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1UpdateDataSetCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -908,16 +668,7 @@ export var serializeAws_restJson1UpdateDataSetCommand = function (input, context
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/data-sets/{DataSetId}";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.Description != null && { Description: input.Description })), (input.Name != null && { Name: input.Name })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -932,7 +683,7 @@ export var serializeAws_restJson1UpdateDataSetCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1UpdateEventActionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -942,16 +693,7 @@ export var serializeAws_restJson1UpdateEventActionCommand = function (input, con
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/event-actions/{EventActionId}";
-                if (input.EventActionId !== undefined) {
-                    labelValue = input.EventActionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: EventActionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{EventActionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: EventActionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "EventActionId", function () { return input.EventActionId; }, "{EventActionId}", false);
                 body = JSON.stringify(__assign({}, (input.Action != null && { Action: serializeAws_restJson1Action(input.Action, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -966,7 +708,7 @@ export var serializeAws_restJson1UpdateEventActionCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1UpdateRevisionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -977,26 +719,8 @@ export var serializeAws_restJson1UpdateRevisionCommand = function (input, contex
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/data-sets/{DataSetId}/revisions/{RevisionId}";
-                if (input.DataSetId !== undefined) {
-                    labelValue = input.DataSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DataSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DataSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DataSetId.");
-                }
-                if (input.RevisionId !== undefined) {
-                    labelValue = input.RevisionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: RevisionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{RevisionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: RevisionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DataSetId", function () { return input.DataSetId; }, "{DataSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "RevisionId", function () { return input.RevisionId; }, "{RevisionId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.Comment != null && { Comment: input.Comment })), (input.Finalized != null && { Finalized: input.Finalized })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1018,18 +742,18 @@ export var deserializeAws_restJson1CancelJobCommand = function (output, context)
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CancelJobCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CancelJobCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1066,14 +790,14 @@ var deserializeAws_restJson1CancelJobCommandError = function (output, context) {
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1085,64 +809,53 @@ export var deserializeAws_restJson1CreateDataSetCommand = function (output, cont
                 if (output.statusCode !== 201 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateDataSetCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    AssetType: undefined,
-                    CreatedAt: undefined,
-                    Description: undefined,
-                    Id: undefined,
-                    Name: undefined,
-                    Origin: undefined,
-                    OriginDetails: undefined,
-                    SourceId: undefined,
-                    Tags: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.AssetType !== undefined && data.AssetType !== null) {
+                if (data.AssetType != null) {
                     contents.AssetType = __expectString(data.AssetType);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.Description !== undefined && data.Description !== null) {
+                if (data.Description != null) {
                     contents.Description = __expectString(data.Description);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.Name !== undefined && data.Name !== null) {
+                if (data.Name != null) {
                     contents.Name = __expectString(data.Name);
                 }
-                if (data.Origin !== undefined && data.Origin !== null) {
+                if (data.Origin != null) {
                     contents.Origin = __expectString(data.Origin);
                 }
-                if (data.OriginDetails !== undefined && data.OriginDetails !== null) {
+                if (data.OriginDetails != null) {
                     contents.OriginDetails = deserializeAws_restJson1OriginDetails(data.OriginDetails, context);
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.Tags !== undefined && data.Tags !== null) {
+                if (data.Tags != null) {
                     contents.Tags = deserializeAws_restJson1MapOf__string(data.Tags, context);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateDataSetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1179,14 +892,14 @@ var deserializeAws_restJson1CreateDataSetCommandError = function (output, contex
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1198,44 +911,38 @@ export var deserializeAws_restJson1CreateEventActionCommand = function (output,
                 if (output.statusCode !== 201 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateEventActionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Action: undefined,
-                    Arn: undefined,
-                    CreatedAt: undefined,
-                    Event: undefined,
-                    Id: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Action !== undefined && data.Action !== null) {
+                if (data.Action != null) {
                     contents.Action = deserializeAws_restJson1Action(data.Action, context);
                 }
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.Event !== undefined && data.Event !== null) {
+                if (data.Event != null) {
                     contents.Event = deserializeAws_restJson1Event(data.Event, context);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateEventActionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1272,14 +979,14 @@ var deserializeAws_restJson1CreateEventActionCommandError = function (output, co
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1291,52 +998,44 @@ export var deserializeAws_restJson1CreateJobCommand = function (output, context)
                 if (output.statusCode !== 201 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateJobCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    CreatedAt: undefined,
-                    Details: undefined,
-                    Errors: undefined,
-                    Id: undefined,
-                    State: undefined,
-                    Type: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.Details !== undefined && data.Details !== null) {
+                if (data.Details != null) {
                     contents.Details = deserializeAws_restJson1ResponseDetails(data.Details, context);
                 }
-                if (data.Errors !== undefined && data.Errors !== null) {
+                if (data.Errors != null) {
                     contents.Errors = deserializeAws_restJson1ListOfJobError(data.Errors, context);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.State !== undefined && data.State !== null) {
+                if (data.State != null) {
                     contents.State = __expectString(data.State);
                 }
-                if (data.Type !== undefined && data.Type !== null) {
+                if (data.Type != null) {
                     contents.Type = __expectString(data.Type);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateJobCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1377,14 +1076,14 @@ var deserializeAws_restJson1CreateJobCommandError = function (output, context) {
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -1396,68 +1095,56 @@ export var deserializeAws_restJson1CreateRevisionCommand = function (output, con
                 if (output.statusCode !== 201 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateRevisionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    Comment: undefined,
-                    CreatedAt: undefined,
-                    DataSetId: undefined,
-                    Finalized: undefined,
-                    Id: undefined,
-                    RevocationComment: undefined,
-                    Revoked: undefined,
-                    RevokedAt: undefined,
-                    SourceId: undefined,
-                    Tags: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.Comment !== undefined && data.Comment !== null) {
+                if (data.Comment != null) {
                     contents.Comment = __expectString(data.Comment);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.DataSetId !== undefined && data.DataSetId !== null) {
+                if (data.DataSetId != null) {
                     contents.DataSetId = __expectString(data.DataSetId);
                 }
-                if (data.Finalized !== undefined && data.Finalized !== null) {
+                if (data.Finalized != null) {
                     contents.Finalized = __expectBoolean(data.Finalized);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.RevocationComment !== undefined && data.RevocationComment !== null) {
+                if (data.RevocationComment != null) {
                     contents.RevocationComment = __expectString(data.RevocationComment);
                 }
-                if (data.Revoked !== undefined && data.Revoked !== null) {
+                if (data.Revoked != null) {
                     contents.Revoked = __expectBoolean(data.Revoked);
                 }
-                if (data.RevokedAt !== undefined && data.RevokedAt !== null) {
+                if (data.RevokedAt != null) {
                     contents.RevokedAt = __expectNonNull(__parseRfc3339DateTime(data.RevokedAt));
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.Tags !== undefined && data.Tags !== null) {
+                if (data.Tags != null) {
                     contents.Tags = deserializeAws_restJson1MapOf__string(data.Tags, context);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateRevisionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1494,14 +1181,14 @@ var deserializeAws_restJson1CreateRevisionCommandError = function (output, conte
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1513,18 +1200,18 @@ export var deserializeAws_restJson1DeleteAssetCommand = function (output, contex
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteAssetCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteAssetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1565,14 +1252,14 @@ var deserializeAws_restJson1DeleteAssetCommandError = function (output, context)
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -1584,18 +1271,18 @@ export var deserializeAws_restJson1DeleteDataSetCommand = function (output, cont
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteDataSetCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteDataSetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1636,14 +1323,14 @@ var deserializeAws_restJson1DeleteDataSetCommandError = function (output, contex
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -1655,18 +1342,18 @@ export var deserializeAws_restJson1DeleteEventActionCommand = function (output,
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteEventActionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteEventActionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1699,14 +1386,14 @@ var deserializeAws_restJson1DeleteEventActionCommandError = function (output, co
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1718,18 +1405,18 @@ export var deserializeAws_restJson1DeleteRevisionCommand = function (output, con
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteRevisionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteRevisionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1770,14 +1457,14 @@ var deserializeAws_restJson1DeleteRevisionCommandError = function (output, conte
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -1789,60 +1476,50 @@ export var deserializeAws_restJson1GetAssetCommand = function (output, context)
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetAssetCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    AssetDetails: undefined,
-                    AssetType: undefined,
-                    CreatedAt: undefined,
-                    DataSetId: undefined,
-                    Id: undefined,
-                    Name: undefined,
-                    RevisionId: undefined,
-                    SourceId: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.AssetDetails !== undefined && data.AssetDetails !== null) {
+                if (data.AssetDetails != null) {
                     contents.AssetDetails = deserializeAws_restJson1AssetDetails(data.AssetDetails, context);
                 }
-                if (data.AssetType !== undefined && data.AssetType !== null) {
+                if (data.AssetType != null) {
                     contents.AssetType = __expectString(data.AssetType);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.DataSetId !== undefined && data.DataSetId !== null) {
+                if (data.DataSetId != null) {
                     contents.DataSetId = __expectString(data.DataSetId);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.Name !== undefined && data.Name !== null) {
+                if (data.Name != null) {
                     contents.Name = __expectString(data.Name);
                 }
-                if (data.RevisionId !== undefined && data.RevisionId !== null) {
+                if (data.RevisionId != null) {
                     contents.RevisionId = __expectString(data.RevisionId);
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetAssetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1875,14 +1552,14 @@ var deserializeAws_restJson1GetAssetCommandError = function (output, context) {
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1894,64 +1571,53 @@ export var deserializeAws_restJson1GetDataSetCommand = function (output, context
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetDataSetCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    AssetType: undefined,
-                    CreatedAt: undefined,
-                    Description: undefined,
-                    Id: undefined,
-                    Name: undefined,
-                    Origin: undefined,
-                    OriginDetails: undefined,
-                    SourceId: undefined,
-                    Tags: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.AssetType !== undefined && data.AssetType !== null) {
+                if (data.AssetType != null) {
                     contents.AssetType = __expectString(data.AssetType);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.Description !== undefined && data.Description !== null) {
+                if (data.Description != null) {
                     contents.Description = __expectString(data.Description);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.Name !== undefined && data.Name !== null) {
+                if (data.Name != null) {
                     contents.Name = __expectString(data.Name);
                 }
-                if (data.Origin !== undefined && data.Origin !== null) {
+                if (data.Origin != null) {
                     contents.Origin = __expectString(data.Origin);
                 }
-                if (data.OriginDetails !== undefined && data.OriginDetails !== null) {
+                if (data.OriginDetails != null) {
                     contents.OriginDetails = deserializeAws_restJson1OriginDetails(data.OriginDetails, context);
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.Tags !== undefined && data.Tags !== null) {
+                if (data.Tags != null) {
                     contents.Tags = deserializeAws_restJson1MapOf__string(data.Tags, context);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetDataSetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1984,14 +1650,14 @@ var deserializeAws_restJson1GetDataSetCommandError = function (output, context)
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2003,44 +1669,38 @@ export var deserializeAws_restJson1GetEventActionCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetEventActionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Action: undefined,
-                    Arn: undefined,
-                    CreatedAt: undefined,
-                    Event: undefined,
-                    Id: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Action !== undefined && data.Action !== null) {
+                if (data.Action != null) {
                     contents.Action = deserializeAws_restJson1Action(data.Action, context);
                 }
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.Event !== undefined && data.Event !== null) {
+                if (data.Event != null) {
                     contents.Event = deserializeAws_restJson1Event(data.Event, context);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetEventActionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2073,14 +1733,14 @@ var deserializeAws_restJson1GetEventActionCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2092,52 +1752,44 @@ export var deserializeAws_restJson1GetJobCommand = function (output, context) {
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetJobCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    CreatedAt: undefined,
-                    Details: undefined,
-                    Errors: undefined,
-                    Id: undefined,
-                    State: undefined,
-                    Type: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.Details !== undefined && data.Details !== null) {
+                if (data.Details != null) {
                     contents.Details = deserializeAws_restJson1ResponseDetails(data.Details, context);
                 }
-                if (data.Errors !== undefined && data.Errors !== null) {
+                if (data.Errors != null) {
                     contents.Errors = deserializeAws_restJson1ListOfJobError(data.Errors, context);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.State !== undefined && data.State !== null) {
+                if (data.State != null) {
                     contents.State = __expectString(data.State);
                 }
-                if (data.Type !== undefined && data.Type !== null) {
+                if (data.Type != null) {
                     contents.Type = __expectString(data.Type);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetJobCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2170,14 +1822,14 @@ var deserializeAws_restJson1GetJobCommandError = function (output, context) { re
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2189,68 +1841,56 @@ export var deserializeAws_restJson1GetRevisionCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetRevisionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    Comment: undefined,
-                    CreatedAt: undefined,
-                    DataSetId: undefined,
-                    Finalized: undefined,
-                    Id: undefined,
-                    RevocationComment: undefined,
-                    Revoked: undefined,
-                    RevokedAt: undefined,
-                    SourceId: undefined,
-                    Tags: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.Comment !== undefined && data.Comment !== null) {
+                if (data.Comment != null) {
                     contents.Comment = __expectString(data.Comment);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.DataSetId !== undefined && data.DataSetId !== null) {
+                if (data.DataSetId != null) {
                     contents.DataSetId = __expectString(data.DataSetId);
                 }
-                if (data.Finalized !== undefined && data.Finalized !== null) {
+                if (data.Finalized != null) {
                     contents.Finalized = __expectBoolean(data.Finalized);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.RevocationComment !== undefined && data.RevocationComment !== null) {
+                if (data.RevocationComment != null) {
                     contents.RevocationComment = __expectString(data.RevocationComment);
                 }
-                if (data.Revoked !== undefined && data.Revoked !== null) {
+                if (data.Revoked != null) {
                     contents.Revoked = __expectBoolean(data.Revoked);
                 }
-                if (data.RevokedAt !== undefined && data.RevokedAt !== null) {
+                if (data.RevokedAt != null) {
                     contents.RevokedAt = __expectNonNull(__parseRfc3339DateTime(data.RevokedAt));
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.Tags !== undefined && data.Tags !== null) {
+                if (data.Tags != null) {
                     contents.Tags = deserializeAws_restJson1MapOf__string(data.Tags, context);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetRevisionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2283,14 +1923,14 @@ var deserializeAws_restJson1GetRevisionCommandError = function (output, context)
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2302,28 +1942,26 @@ export var deserializeAws_restJson1ListDataSetRevisionsCommand = function (outpu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListDataSetRevisionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    Revisions: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.NextToken !== undefined && data.NextToken !== null) {
+                if (data.NextToken != null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
-                if (data.Revisions !== undefined && data.Revisions !== null) {
+                if (data.Revisions != null) {
                     contents.Revisions = deserializeAws_restJson1ListOfRevisionEntry(data.Revisions, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListDataSetRevisionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2356,14 +1994,14 @@ var deserializeAws_restJson1ListDataSetRevisionsCommandError = function (output,
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2375,28 +2013,26 @@ export var deserializeAws_restJson1ListDataSetsCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListDataSetsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DataSets: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.DataSets !== undefined && data.DataSets !== null) {
+                if (data.DataSets != null) {
                     contents.DataSets = deserializeAws_restJson1ListOfDataSetEntry(data.DataSets, context);
                 }
-                if (data.NextToken !== undefined && data.NextToken !== null) {
+                if (data.NextToken != null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListDataSetsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2429,14 +2065,14 @@ var deserializeAws_restJson1ListDataSetsCommandError = function (output, context
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2448,28 +2084,26 @@ export var deserializeAws_restJson1ListEventActionsCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListEventActionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    EventActions: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.EventActions !== undefined && data.EventActions !== null) {
+                if (data.EventActions != null) {
                     contents.EventActions = deserializeAws_restJson1ListOfEventActionEntry(data.EventActions, context);
                 }
-                if (data.NextToken !== undefined && data.NextToken !== null) {
+                if (data.NextToken != null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListEventActionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2502,14 +2136,14 @@ var deserializeAws_restJson1ListEventActionsCommandError = function (output, con
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2521,28 +2155,26 @@ export var deserializeAws_restJson1ListJobsCommand = function (output, context)
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListJobsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Jobs: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Jobs !== undefined && data.Jobs !== null) {
+                if (data.Jobs != null) {
                     contents.Jobs = deserializeAws_restJson1ListOfJobEntry(data.Jobs, context);
                 }
-                if (data.NextToken !== undefined && data.NextToken !== null) {
+                if (data.NextToken != null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListJobsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2575,14 +2207,14 @@ var deserializeAws_restJson1ListJobsCommandError = function (output, context) {
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2594,28 +2226,26 @@ export var deserializeAws_restJson1ListRevisionAssetsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListRevisionAssetsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Assets: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Assets !== undefined && data.Assets !== null) {
+                if (data.Assets != null) {
                     contents.Assets = deserializeAws_restJson1ListOfAssetEntry(data.Assets, context);
                 }
-                if (data.NextToken !== undefined && data.NextToken !== null) {
+                if (data.NextToken != null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListRevisionAssetsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2648,14 +2278,14 @@ var deserializeAws_restJson1ListRevisionAssetsCommandError = function (output, c
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2667,24 +2297,23 @@ export var deserializeAws_restJson1ListTagsForResourceCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListTagsForResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Tags: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.tags !== undefined && data.tags !== null) {
+                if (data.tags != null) {
                     contents.Tags = deserializeAws_restJson1MapOf__string(data.tags, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -2695,18 +2324,13 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-                switch (errorCode) {
-                    default:
-                        parsedBody = parsedOutput.body;
-                        $metadata = deserializeMetadata(output);
-                        statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                        response = new __BaseException({
-                            name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                            $fault: "client",
-                            $metadata: $metadata,
-                        });
-                        throw __decorateServiceException(response, parsedBody);
-                }
+                parsedBody = parsedOutput.body;
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
+                });
                 return [2];
         }
     });
@@ -2719,64 +2343,53 @@ export var deserializeAws_restJson1RevokeRevisionCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1RevokeRevisionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    Comment: undefined,
-                    CreatedAt: undefined,
-                    DataSetId: undefined,
-                    Finalized: undefined,
-                    Id: undefined,
-                    RevocationComment: undefined,
-                    Revoked: undefined,
-                    RevokedAt: undefined,
-                    SourceId: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.Comment !== undefined && data.Comment !== null) {
+                if (data.Comment != null) {
                     contents.Comment = __expectString(data.Comment);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.DataSetId !== undefined && data.DataSetId !== null) {
+                if (data.DataSetId != null) {
                     contents.DataSetId = __expectString(data.DataSetId);
                 }
-                if (data.Finalized !== undefined && data.Finalized !== null) {
+                if (data.Finalized != null) {
                     contents.Finalized = __expectBoolean(data.Finalized);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.RevocationComment !== undefined && data.RevocationComment !== null) {
+                if (data.RevocationComment != null) {
                     contents.RevocationComment = __expectString(data.RevocationComment);
                 }
-                if (data.Revoked !== undefined && data.Revoked !== null) {
+                if (data.Revoked != null) {
                     contents.Revoked = __expectBoolean(data.Revoked);
                 }
-                if (data.RevokedAt !== undefined && data.RevokedAt !== null) {
+                if (data.RevokedAt != null) {
                     contents.RevokedAt = __expectNonNull(__parseRfc3339DateTime(data.RevokedAt));
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1RevokeRevisionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2817,14 +2430,14 @@ var deserializeAws_restJson1RevokeRevisionCommandError = function (output, conte
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2836,29 +2449,28 @@ export var deserializeAws_restJson1SendApiAssetCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1SendApiAssetCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Body: undefined,
-                    ResponseHeaders: undefined,
-                };
-                Object.keys(output.headers).forEach(function (header) {
-                    if (contents.ResponseHeaders === undefined) {
-                        contents.ResponseHeaders = {};
-                    }
-                    if (header.startsWith("")) {
-                        contents.ResponseHeaders[header.substring(0)] = output.headers[header];
-                    }
+                    ResponseHeaders: [
+                        ,
+                        Object.keys(output.headers)
+                            .filter(function (header) { return header.startsWith(""); })
+                            .reduce(function (acc, header) {
+                            acc[header.substring(0)] = output.headers[header];
+                            return acc;
+                        }, {}),
+                    ],
                 });
                 return [4, collectBodyString(output.body, context)];
             case 1:
                 data = _a.sent();
                 contents.Body = __expectString(data);
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1SendApiAssetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2895,14 +2507,14 @@ var deserializeAws_restJson1SendApiAssetCommandError = function (output, context
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2914,18 +2526,18 @@ export var deserializeAws_restJson1StartJobCommand = function (output, context)
                 if (output.statusCode !== 202 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StartJobCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1StartJobCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2966,14 +2578,14 @@ var deserializeAws_restJson1StartJobCommandError = function (output, context) {
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2985,18 +2597,18 @@ export var deserializeAws_restJson1TagResourceCommand = function (output, contex
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1TagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1TagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3007,18 +2619,13 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-                switch (errorCode) {
-                    default:
-                        parsedBody = parsedOutput.body;
-                        $metadata = deserializeMetadata(output);
-                        statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                        response = new __BaseException({
-                            name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                            $fault: "client",
-                            $metadata: $metadata,
-                        });
-                        throw __decorateServiceException(response, parsedBody);
-                }
+                parsedBody = parsedOutput.body;
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
+                });
                 return [2];
         }
     });
@@ -3031,18 +2638,18 @@ export var deserializeAws_restJson1UntagResourceCommand = function (output, cont
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UntagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UntagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -3053,18 +2660,13 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-                switch (errorCode) {
-                    default:
-                        parsedBody = parsedOutput.body;
-                        $metadata = deserializeMetadata(output);
-                        statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                        response = new __BaseException({
-                            name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                            $fault: "client",
-                            $metadata: $metadata,
-                        });
-                        throw __decorateServiceException(response, parsedBody);
-                }
+                parsedBody = parsedOutput.body;
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
+                });
                 return [2];
         }
     });
@@ -3077,60 +2679,50 @@ export var deserializeAws_restJson1UpdateAssetCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateAssetCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    AssetDetails: undefined,
-                    AssetType: undefined,
-                    CreatedAt: undefined,
-                    DataSetId: undefined,
-                    Id: undefined,
-                    Name: undefined,
-                    RevisionId: undefined,
-                    SourceId: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.AssetDetails !== undefined && data.AssetDetails !== null) {
+                if (data.AssetDetails != null) {
                     contents.AssetDetails = deserializeAws_restJson1AssetDetails(data.AssetDetails, context);
                 }
-                if (data.AssetType !== undefined && data.AssetType !== null) {
+                if (data.AssetType != null) {
                     contents.AssetType = __expectString(data.AssetType);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.DataSetId !== undefined && data.DataSetId !== null) {
+                if (data.DataSetId != null) {
                     contents.DataSetId = __expectString(data.DataSetId);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.Name !== undefined && data.Name !== null) {
+                if (data.Name != null) {
                     contents.Name = __expectString(data.Name);
                 }
-                if (data.RevisionId !== undefined && data.RevisionId !== null) {
+                if (data.RevisionId != null) {
                     contents.RevisionId = __expectString(data.RevisionId);
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateAssetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3171,14 +2763,14 @@ var deserializeAws_restJson1UpdateAssetCommandError = function (output, context)
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -3190,60 +2782,50 @@ export var deserializeAws_restJson1UpdateDataSetCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateDataSetCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    AssetType: undefined,
-                    CreatedAt: undefined,
-                    Description: undefined,
-                    Id: undefined,
-                    Name: undefined,
-                    Origin: undefined,
-                    OriginDetails: undefined,
-                    SourceId: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.AssetType !== undefined && data.AssetType !== null) {
+                if (data.AssetType != null) {
                     contents.AssetType = __expectString(data.AssetType);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.Description !== undefined && data.Description !== null) {
+                if (data.Description != null) {
                     contents.Description = __expectString(data.Description);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.Name !== undefined && data.Name !== null) {
+                if (data.Name != null) {
                     contents.Name = __expectString(data.Name);
                 }
-                if (data.Origin !== undefined && data.Origin !== null) {
+                if (data.Origin != null) {
                     contents.Origin = __expectString(data.Origin);
                 }
-                if (data.OriginDetails !== undefined && data.OriginDetails !== null) {
+                if (data.OriginDetails != null) {
                     contents.OriginDetails = deserializeAws_restJson1OriginDetails(data.OriginDetails, context);
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateDataSetCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3280,14 +2862,14 @@ var deserializeAws_restJson1UpdateDataSetCommandError = function (output, contex
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3299,44 +2881,38 @@ export var deserializeAws_restJson1UpdateEventActionCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateEventActionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Action: undefined,
-                    Arn: undefined,
-                    CreatedAt: undefined,
-                    Event: undefined,
-                    Id: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Action !== undefined && data.Action !== null) {
+                if (data.Action != null) {
                     contents.Action = deserializeAws_restJson1Action(data.Action, context);
                 }
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.Event !== undefined && data.Event !== null) {
+                if (data.Event != null) {
                     contents.Event = deserializeAws_restJson1Event(data.Event, context);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateEventActionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3373,14 +2949,14 @@ var deserializeAws_restJson1UpdateEventActionCommandError = function (output, co
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3392,64 +2968,53 @@ export var deserializeAws_restJson1UpdateRevisionCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateRevisionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    Comment: undefined,
-                    CreatedAt: undefined,
-                    DataSetId: undefined,
-                    Finalized: undefined,
-                    Id: undefined,
-                    RevocationComment: undefined,
-                    Revoked: undefined,
-                    RevokedAt: undefined,
-                    SourceId: undefined,
-                    UpdatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Arn !== undefined && data.Arn !== null) {
+                if (data.Arn != null) {
                     contents.Arn = __expectString(data.Arn);
                 }
-                if (data.Comment !== undefined && data.Comment !== null) {
+                if (data.Comment != null) {
                     contents.Comment = __expectString(data.Comment);
                 }
-                if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+                if (data.CreatedAt != null) {
                     contents.CreatedAt = __expectNonNull(__parseRfc3339DateTime(data.CreatedAt));
                 }
-                if (data.DataSetId !== undefined && data.DataSetId !== null) {
+                if (data.DataSetId != null) {
                     contents.DataSetId = __expectString(data.DataSetId);
                 }
-                if (data.Finalized !== undefined && data.Finalized !== null) {
+                if (data.Finalized != null) {
                     contents.Finalized = __expectBoolean(data.Finalized);
                 }
-                if (data.Id !== undefined && data.Id !== null) {
+                if (data.Id != null) {
                     contents.Id = __expectString(data.Id);
                 }
-                if (data.RevocationComment !== undefined && data.RevocationComment !== null) {
+                if (data.RevocationComment != null) {
                     contents.RevocationComment = __expectString(data.RevocationComment);
                 }
-                if (data.Revoked !== undefined && data.Revoked !== null) {
+                if (data.Revoked != null) {
                     contents.Revoked = __expectBoolean(data.Revoked);
                 }
-                if (data.RevokedAt !== undefined && data.RevokedAt !== null) {
+                if (data.RevokedAt != null) {
                     contents.RevokedAt = __expectNonNull(__parseRfc3339DateTime(data.RevokedAt));
                 }
-                if (data.SourceId !== undefined && data.SourceId !== null) {
+                if (data.SourceId != null) {
                     contents.SourceId = __expectString(data.SourceId);
                 }
-                if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+                if (data.UpdatedAt != null) {
                     contents.UpdatedAt = __expectNonNull(__parseRfc3339DateTime(data.UpdatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateRevisionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3490,23 +3055,24 @@ var deserializeAws_restJson1UpdateRevisionCommandError = function (output, conte
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
+var map = __map;
 var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
         exception = new AccessDeniedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3516,15 +3082,15 @@ var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutp
 var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
-        if (data.ResourceId !== undefined && data.ResourceId !== null) {
+        if (data.ResourceId != null) {
             contents.ResourceId = __expectString(data.ResourceId);
         }
-        if (data.ResourceType !== undefined && data.ResourceType !== null) {
+        if (data.ResourceType != null) {
             contents.ResourceType = __expectString(data.ResourceType);
         }
         exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3534,9 +3100,9 @@ var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
         exception = new InternalServerException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3546,15 +3112,15 @@ var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOu
 var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
-        if (data.ResourceId !== undefined && data.ResourceId !== null) {
+        if (data.ResourceId != null) {
             contents.ResourceId = __expectString(data.ResourceId);
         }
-        if (data.ResourceType !== undefined && data.ResourceType !== null) {
+        if (data.ResourceType != null) {
             contents.ResourceType = __expectString(data.ResourceType);
         }
         exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3564,15 +3130,15 @@ var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsed
 var deserializeAws_restJson1ServiceLimitExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.LimitName !== undefined && data.LimitName !== null) {
+        if (data.LimitName != null) {
             contents.LimitName = __expectString(data.LimitName);
         }
-        if (data.LimitValue !== undefined && data.LimitValue !== null) {
+        if (data.LimitValue != null) {
             contents.LimitValue = __limitedParseDouble(data.LimitValue);
         }
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
         exception = new ServiceLimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3582,9 +3148,9 @@ var deserializeAws_restJson1ServiceLimitExceededExceptionResponse = function (pa
 var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
         exception = new ThrottlingException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3594,12 +3160,12 @@ var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput
 var deserializeAws_restJson1ValidationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.ExceptionCause !== undefined && data.ExceptionCause !== null) {
+        if (data.ExceptionCause != null) {
             contents.ExceptionCause = __expectString(data.ExceptionCause);
         }
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
         exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3672,9 +3238,6 @@ var serializeAws_restJson1ListOfAssetDestinationEntry = function (input, context
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AssetDestinationEntry(entry, context);
     });
 };
@@ -3682,9 +3245,6 @@ var serializeAws_restJson1ListOfAssetSourceEntry = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AssetSourceEntry(entry, context);
     });
 };
@@ -3692,9 +3252,6 @@ var serializeAws_restJson1ListOfRedshiftDataShareAssetSourceEntry = function (in
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1RedshiftDataShareAssetSourceEntry(entry, context);
     });
 };
@@ -3702,9 +3259,6 @@ var serializeAws_restJson1ListOfRevisionDestinationEntry = function (input, cont
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1RevisionDestinationEntry(entry, context);
     });
 };