@aws-sdk/client-auditmanager 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 } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, parseEpochTimestamp as __parseEpochTimestamp, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, map as __map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { AuditManagerServiceException as __BaseException } from "../models/AuditManagerServiceException";
 import { AccessDeniedException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, ValidationException, } from "../models/models_0";
 export var serializeAws_restJson1AssociateAssessmentReportEvidenceFolderCommand = 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()];
@@ -15,16 +15,7 @@ export var serializeAws_restJson1AssociateAssessmentReportEvidenceFolderCommand
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/associateToAssessmentReport";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign({}, (input.evidenceFolderId != null && { evidenceFolderId: input.evidenceFolderId })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -39,7 +30,7 @@ export var serializeAws_restJson1AssociateAssessmentReportEvidenceFolderCommand
     });
 }); };
 export var serializeAws_restJson1BatchAssociateAssessmentReportEvidenceCommand = 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()];
@@ -50,16 +41,7 @@ export var serializeAws_restJson1BatchAssociateAssessmentReportEvidenceCommand =
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/batchAssociateToAssessmentReport";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.evidenceFolderId != null && { evidenceFolderId: input.evidenceFolderId })), (input.evidenceIds != null && { evidenceIds: serializeAws_restJson1EvidenceIds(input.evidenceIds, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -74,7 +56,7 @@ export var serializeAws_restJson1BatchAssociateAssessmentReportEvidenceCommand =
     });
 }); };
 export var serializeAws_restJson1BatchCreateDelegationByAssessmentCommand = 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()];
@@ -84,16 +66,7 @@ export var serializeAws_restJson1BatchCreateDelegationByAssessmentCommand = func
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/assessments/{assessmentId}/delegations";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign({}, (input.createDelegationRequests != null && {
                     createDelegationRequests: serializeAws_restJson1CreateDelegationRequests(input.createDelegationRequests, context),
                 })));
@@ -110,7 +83,7 @@ export var serializeAws_restJson1BatchCreateDelegationByAssessmentCommand = func
     });
 }); };
 export var serializeAws_restJson1BatchDeleteDelegationByAssessmentCommand = 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()];
@@ -120,16 +93,7 @@ export var serializeAws_restJson1BatchDeleteDelegationByAssessmentCommand = func
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/assessments/{assessmentId}/delegations";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign({}, (input.delegationIds != null && {
                     delegationIds: serializeAws_restJson1DelegationIds(input.delegationIds, context),
                 })));
@@ -146,7 +110,7 @@ export var serializeAws_restJson1BatchDeleteDelegationByAssessmentCommand = func
     });
 }); };
 export var serializeAws_restJson1BatchDisassociateAssessmentReportEvidenceCommand = 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()];
@@ -157,16 +121,7 @@ export var serializeAws_restJson1BatchDisassociateAssessmentReportEvidenceComman
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/batchDisassociateFromAssessmentReport";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.evidenceFolderId != null && { evidenceFolderId: input.evidenceFolderId })), (input.evidenceIds != null && { evidenceIds: serializeAws_restJson1EvidenceIds(input.evidenceIds, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -181,7 +136,7 @@ export var serializeAws_restJson1BatchDisassociateAssessmentReportEvidenceComman
     });
 }); };
 export var serializeAws_restJson1BatchImportEvidenceToAssessmentControlCommand = 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()];
@@ -192,36 +147,9 @@ export var serializeAws_restJson1BatchImportEvidenceToAssessmentControlCommand =
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/controlSets/{controlSetId}/controls/{controlId}/evidence";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                if (input.controlSetId !== undefined) {
-                    labelValue = input.controlSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlSetId.");
-                }
-                if (input.controlId !== undefined) {
-                    labelValue = input.controlId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlSetId", function () { return input.controlSetId; }, "{controlSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlId", function () { return input.controlId; }, "{controlId}", false);
                 body = JSON.stringify(__assign({}, (input.manualEvidence != null && {
                     manualEvidence: serializeAws_restJson1ManualEvidenceList(input.manualEvidence, context),
                 })));
@@ -290,7 +218,7 @@ export var serializeAws_restJson1CreateAssessmentFrameworkCommand = function (in
     });
 }); };
 export var serializeAws_restJson1CreateAssessmentReportCommand = 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()];
@@ -300,16 +228,7 @@ export var serializeAws_restJson1CreateAssessmentReportCommand = function (input
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/assessments/{assessmentId}/reports";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.description != null && { description: input.description })), (input.name != null && { name: input.name })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -350,7 +269,7 @@ export var serializeAws_restJson1CreateControlCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1DeleteAssessmentCommand = 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()];
@@ -358,16 +277,7 @@ export var serializeAws_restJson1DeleteAssessmentCommand = 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 || "") + "/assessments/{assessmentId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -381,7 +291,7 @@ export var serializeAws_restJson1DeleteAssessmentCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1DeleteAssessmentFrameworkCommand = 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()];
@@ -389,16 +299,7 @@ export var serializeAws_restJson1DeleteAssessmentFrameworkCommand = function (in
                 _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 || "") + "/assessmentFrameworks/{frameworkId}";
-                if (input.frameworkId !== undefined) {
-                    labelValue = input.frameworkId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: frameworkId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{frameworkId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: frameworkId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "frameworkId", function () { return input.frameworkId; }, "{frameworkId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -412,7 +313,7 @@ export var serializeAws_restJson1DeleteAssessmentFrameworkCommand = function (in
     });
 }); };
 export var serializeAws_restJson1DeleteAssessmentFrameworkShareCommand = 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()];
@@ -421,17 +322,10 @@ export var serializeAws_restJson1DeleteAssessmentFrameworkShareCommand = functio
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessmentFrameworkShareRequests/{requestId}";
-                if (input.requestId !== undefined) {
-                    labelValue = input.requestId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: requestId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{requestId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: requestId.");
-                }
-                query = __assign({}, (input.requestType !== undefined && { requestType: input.requestType }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "requestId", function () { return input.requestId; }, "{requestId}", false);
+                query = map({
+                    requestType: [, input.requestType],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -446,7 +340,7 @@ export var serializeAws_restJson1DeleteAssessmentFrameworkShareCommand = functio
     });
 }); };
 export var serializeAws_restJson1DeleteAssessmentReportCommand = 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()];
@@ -455,26 +349,8 @@ export var serializeAws_restJson1DeleteAssessmentReportCommand = function (input
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/reports/{assessmentReportId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                if (input.assessmentReportId !== undefined) {
-                    labelValue = input.assessmentReportId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentReportId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentReportId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentReportId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentReportId", function () { return input.assessmentReportId; }, "{assessmentReportId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -488,7 +364,7 @@ export var serializeAws_restJson1DeleteAssessmentReportCommand = function (input
     });
 }); };
 export var serializeAws_restJson1DeleteControlCommand = 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()];
@@ -496,16 +372,7 @@ export var serializeAws_restJson1DeleteControlCommand = 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 || "") + "/controls/{controlId}";
-                if (input.controlId !== undefined) {
-                    labelValue = input.controlId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlId", function () { return input.controlId; }, "{controlId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -568,7 +435,7 @@ export var serializeAws_restJson1DeregisterOrganizationAdminAccountCommand = fun
     });
 }); };
 export var serializeAws_restJson1DisassociateAssessmentReportEvidenceFolderCommand = 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()];
@@ -579,16 +446,7 @@ export var serializeAws_restJson1DisassociateAssessmentReportEvidenceFolderComma
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/disassociateFromAssessmentReport";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign({}, (input.evidenceFolderId != null && { evidenceFolderId: input.evidenceFolderId })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -627,7 +485,7 @@ export var serializeAws_restJson1GetAccountStatusCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1GetAssessmentCommand = 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()];
@@ -635,16 +493,7 @@ export var serializeAws_restJson1GetAssessmentCommand = 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 || "") + "/assessments/{assessmentId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -658,7 +507,7 @@ export var serializeAws_restJson1GetAssessmentCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1GetAssessmentFrameworkCommand = 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()];
@@ -666,16 +515,7 @@ export var serializeAws_restJson1GetAssessmentFrameworkCommand = 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 || "") + "/assessmentFrameworks/{frameworkId}";
-                if (input.frameworkId !== undefined) {
-                    labelValue = input.frameworkId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: frameworkId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{frameworkId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: frameworkId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "frameworkId", function () { return input.frameworkId; }, "{frameworkId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -689,7 +529,7 @@ export var serializeAws_restJson1GetAssessmentFrameworkCommand = function (input
     });
 }); };
 export var serializeAws_restJson1GetAssessmentReportUrlCommand = 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()];
@@ -698,26 +538,8 @@ export var serializeAws_restJson1GetAssessmentReportUrlCommand = function (input
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/reports/{assessmentReportId}/url";
-                if (input.assessmentReportId !== undefined) {
-                    labelValue = input.assessmentReportId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentReportId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentReportId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentReportId.");
-                }
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentReportId", function () { return input.assessmentReportId; }, "{assessmentReportId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -731,7 +553,7 @@ export var serializeAws_restJson1GetAssessmentReportUrlCommand = function (input
     });
 }); };
 export var serializeAws_restJson1GetChangeLogsCommand = 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()];
@@ -739,17 +561,13 @@ export var serializeAws_restJson1GetChangeLogsCommand = 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 || "") + "/assessments/{assessmentId}/changelogs";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                query = __assign(__assign(__assign(__assign({}, (input.controlSetId !== undefined && { controlSetId: input.controlSetId })), (input.controlId !== undefined && { controlId: input.controlId })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                query = map({
+                    controlSetId: [, input.controlSetId],
+                    controlId: [, input.controlId],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -764,7 +582,7 @@ export var serializeAws_restJson1GetChangeLogsCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1GetControlCommand = 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()];
@@ -772,16 +590,7 @@ export var serializeAws_restJson1GetControlCommand = 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 || "") + "/controls/{controlId}";
-                if (input.controlId !== undefined) {
-                    labelValue = input.controlId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlId", function () { return input.controlId; }, "{controlId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -803,7 +612,10 @@ export var serializeAws_restJson1GetDelegationsCommand = 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 || "") + "/delegations";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -818,7 +630,7 @@ export var serializeAws_restJson1GetDelegationsCommand = function (input, contex
     });
 }); };
 export var serializeAws_restJson1GetEvidenceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, 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()];
@@ -827,46 +639,10 @@ export var serializeAws_restJson1GetEvidenceCommand = function (input, context)
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/controlSets/{controlSetId}/evidenceFolders/{evidenceFolderId}/evidence/{evidenceId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                if (input.controlSetId !== undefined) {
-                    labelValue = input.controlSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlSetId.");
-                }
-                if (input.evidenceFolderId !== undefined) {
-                    labelValue = input.evidenceFolderId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: evidenceFolderId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{evidenceFolderId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: evidenceFolderId.");
-                }
-                if (input.evidenceId !== undefined) {
-                    labelValue = input.evidenceId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: evidenceId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{evidenceId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: evidenceId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlSetId", function () { return input.controlSetId; }, "{controlSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "evidenceFolderId", function () { return input.evidenceFolderId; }, "{evidenceFolderId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "evidenceId", function () { return input.evidenceId; }, "{evidenceId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -880,7 +656,7 @@ export var serializeAws_restJson1GetEvidenceCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1GetEvidenceByEvidenceFolderCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, 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()];
@@ -889,37 +665,13 @@ export var serializeAws_restJson1GetEvidenceByEvidenceFolderCommand = function (
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/controlSets/{controlSetId}/evidenceFolders/{evidenceFolderId}/evidence";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                if (input.controlSetId !== undefined) {
-                    labelValue = input.controlSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlSetId.");
-                }
-                if (input.evidenceFolderId !== undefined) {
-                    labelValue = input.evidenceFolderId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: evidenceFolderId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{evidenceFolderId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: evidenceFolderId.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlSetId", function () { return input.controlSetId; }, "{controlSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "evidenceFolderId", function () { return input.evidenceFolderId; }, "{evidenceFolderId}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -934,7 +686,7 @@ export var serializeAws_restJson1GetEvidenceByEvidenceFolderCommand = function (
     });
 }); };
 export var serializeAws_restJson1GetEvidenceFolderCommand = 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()];
@@ -943,36 +695,9 @@ export var serializeAws_restJson1GetEvidenceFolderCommand = function (input, con
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/controlSets/{controlSetId}/evidenceFolders/{evidenceFolderId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                if (input.controlSetId !== undefined) {
-                    labelValue = input.controlSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlSetId.");
-                }
-                if (input.evidenceFolderId !== undefined) {
-                    labelValue = input.evidenceFolderId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: evidenceFolderId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{evidenceFolderId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: evidenceFolderId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlSetId", function () { return input.controlSetId; }, "{controlSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "evidenceFolderId", function () { return input.evidenceFolderId; }, "{evidenceFolderId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -986,7 +711,7 @@ export var serializeAws_restJson1GetEvidenceFolderCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1GetEvidenceFoldersByAssessmentCommand = 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()];
@@ -995,17 +720,11 @@ export var serializeAws_restJson1GetEvidenceFoldersByAssessmentCommand = functio
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/evidenceFolders";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1020,7 +739,7 @@ export var serializeAws_restJson1GetEvidenceFoldersByAssessmentCommand = functio
     });
 }); };
 export var serializeAws_restJson1GetEvidenceFoldersByAssessmentControlCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, 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()];
@@ -1029,37 +748,13 @@ export var serializeAws_restJson1GetEvidenceFoldersByAssessmentControlCommand =
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/evidenceFolders-by-assessment-control/{controlSetId}/{controlId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                if (input.controlSetId !== undefined) {
-                    labelValue = input.controlSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlSetId.");
-                }
-                if (input.controlId !== undefined) {
-                    labelValue = input.controlId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlId.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlSetId", function () { return input.controlSetId; }, "{controlSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlId", function () { return input.controlId; }, "{controlId}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1098,7 +793,7 @@ export var serializeAws_restJson1GetInsightsCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1GetInsightsByAssessmentCommand = 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()];
@@ -1106,16 +801,7 @@ export var serializeAws_restJson1GetInsightsByAssessmentCommand = function (inpu
                 _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 || "") + "/insights/assessments/{assessmentId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1177,7 +863,7 @@ export var serializeAws_restJson1GetServicesInScopeCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1GetSettingsCommand = 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()];
@@ -1185,16 +871,7 @@ export var serializeAws_restJson1GetSettingsCommand = 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 || "") + "/settings/{attribute}";
-                if (input.attribute !== undefined) {
-                    labelValue = input.attribute;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: attribute.");
-                    }
-                    resolvedPath = resolvedPath.replace("{attribute}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: attribute.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "attribute", function () { return input.attribute; }, "{attribute}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1216,7 +893,12 @@ export var serializeAws_restJson1ListAssessmentControlInsightsByControlDomainCom
                 _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 || "") + "/insights/controls-by-assessment";
-                query = __assign(__assign(__assign(__assign({}, (input.controlDomainId !== undefined && { controlDomainId: input.controlDomainId })), (input.assessmentId !== undefined && { assessmentId: input.assessmentId })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    controlDomainId: [, input.controlDomainId],
+                    assessmentId: [, input.assessmentId],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1239,7 +921,11 @@ export var serializeAws_restJson1ListAssessmentFrameworksCommand = function (inp
                 _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 || "") + "/assessmentFrameworks";
-                query = __assign(__assign(__assign({}, (input.frameworkType !== undefined && { frameworkType: input.frameworkType })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    frameworkType: [, input.frameworkType],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1262,7 +948,11 @@ export var serializeAws_restJson1ListAssessmentFrameworkShareRequestsCommand = f
                 _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 || "") + "/assessmentFrameworkShareRequests";
-                query = __assign(__assign(__assign({}, (input.requestType !== undefined && { requestType: input.requestType })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    requestType: [, input.requestType],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1285,7 +975,10 @@ export var serializeAws_restJson1ListAssessmentReportsCommand = 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 || "") + "/assessmentReports";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1308,7 +1001,11 @@ export var serializeAws_restJson1ListAssessmentsCommand = function (input, conte
                 _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 || "") + "/assessments";
-                query = __assign(__assign(__assign({}, (input.status !== undefined && { status: input.status })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    status: [, input.status],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1331,7 +1028,10 @@ export var serializeAws_restJson1ListControlDomainInsightsCommand = function (in
                 _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 || "") + "/insights/control-domains";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1354,7 +1054,11 @@ export var serializeAws_restJson1ListControlDomainInsightsByAssessmentCommand =
                 _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 || "") + "/insights/control-domains-by-assessment";
-                query = __assign(__assign(__assign({}, (input.assessmentId !== undefined && { assessmentId: input.assessmentId })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    assessmentId: [, input.assessmentId],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1377,7 +1081,11 @@ export var serializeAws_restJson1ListControlInsightsByControlDomainCommand = fun
                 _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 || "") + "/insights/controls";
-                query = __assign(__assign(__assign({}, (input.controlDomainId !== undefined && { controlDomainId: input.controlDomainId })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    controlDomainId: [, input.controlDomainId],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1400,7 +1108,11 @@ export var serializeAws_restJson1ListControlsCommand = 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 || "") + "/controls";
-                query = __assign(__assign(__assign({}, (input.controlType !== undefined && { controlType: input.controlType })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    controlType: [, input.controlType],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1423,7 +1135,11 @@ export var serializeAws_restJson1ListKeywordsForDataSourceCommand = function (in
                 _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 || "") + "/dataSourceKeywords";
-                query = __assign(__assign(__assign({}, (input.source !== undefined && { source: input.source })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    source: [, input.source],
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1446,7 +1162,10 @@ export var serializeAws_restJson1ListNotificationsCommand = 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 || "") + "/notifications";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1461,7 +1180,7 @@ export var serializeAws_restJson1ListNotificationsCommand = function (input, con
     });
 }); };
 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()];
@@ -1469,16 +1188,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,
@@ -1540,7 +1250,7 @@ export var serializeAws_restJson1RegisterOrganizationAdminAccountCommand = funct
     });
 }); };
 export var serializeAws_restJson1StartAssessmentFrameworkShareCommand = 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()];
@@ -1551,16 +1261,7 @@ export var serializeAws_restJson1StartAssessmentFrameworkShareCommand = function
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessmentFrameworks/{frameworkId}/shareRequests";
-                if (input.frameworkId !== undefined) {
-                    labelValue = input.frameworkId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: frameworkId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{frameworkId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: frameworkId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "frameworkId", function () { return input.frameworkId; }, "{frameworkId}", false);
                 body = JSON.stringify(__assign(__assign(__assign({}, (input.comment != null && { comment: input.comment })), (input.destinationAccount != null && { destinationAccount: input.destinationAccount })), (input.destinationRegion != null && { destinationRegion: input.destinationRegion })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1575,7 +1276,7 @@ export var serializeAws_restJson1StartAssessmentFrameworkShareCommand = function
     });
 }); };
 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()];
@@ -1585,16 +1286,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_restJson1TagMap(input.tags, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1609,7 +1301,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()];
@@ -1617,17 +1309,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,
@@ -1642,7 +1327,7 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1UpdateAssessmentCommand = 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()];
@@ -1652,16 +1337,7 @@ export var serializeAws_restJson1UpdateAssessmentCommand = function (input, cont
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/assessments/{assessmentId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign({}, (input.assessmentDescription != null && { assessmentDescription: input.assessmentDescription })), (input.assessmentName != null && { assessmentName: input.assessmentName })), (input.assessmentReportsDestination != null && {
                     assessmentReportsDestination: serializeAws_restJson1AssessmentReportsDestination(input.assessmentReportsDestination, context),
                 })), (input.roles != null && { roles: serializeAws_restJson1Roles(input.roles, context) })), (input.scope != null && { scope: serializeAws_restJson1Scope(input.scope, context) })));
@@ -1678,7 +1354,7 @@ export var serializeAws_restJson1UpdateAssessmentCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1UpdateAssessmentControlCommand = 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()];
@@ -1689,36 +1365,9 @@ export var serializeAws_restJson1UpdateAssessmentControlCommand = function (inpu
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/controlSets/{controlSetId}/controls/{controlId}";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                if (input.controlSetId !== undefined) {
-                    labelValue = input.controlSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlSetId.");
-                }
-                if (input.controlId !== undefined) {
-                    labelValue = input.controlId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlSetId", function () { return input.controlSetId; }, "{controlSetId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlId", function () { return input.controlId; }, "{controlId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.commentBody != null && { commentBody: input.commentBody })), (input.controlStatus != null && { controlStatus: input.controlStatus })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1733,7 +1382,7 @@ export var serializeAws_restJson1UpdateAssessmentControlCommand = function (inpu
     });
 }); };
 export var serializeAws_restJson1UpdateAssessmentControlSetStatusCommand = 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()];
@@ -1744,26 +1393,8 @@ export var serializeAws_restJson1UpdateAssessmentControlSetStatusCommand = funct
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessments/{assessmentId}/controlSets/{controlSetId}/status";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
-                if (input.controlSetId !== undefined) {
-                    labelValue = input.controlSetId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlSetId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlSetId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlSetId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlSetId", function () { return input.controlSetId; }, "{controlSetId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.comment != null && { comment: input.comment })), (input.status != null && { status: input.status })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1778,7 +1409,7 @@ export var serializeAws_restJson1UpdateAssessmentControlSetStatusCommand = funct
     });
 }); };
 export var serializeAws_restJson1UpdateAssessmentFrameworkCommand = 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()];
@@ -1788,16 +1419,7 @@ export var serializeAws_restJson1UpdateAssessmentFrameworkCommand = function (in
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/assessmentFrameworks/{frameworkId}";
-                if (input.frameworkId !== undefined) {
-                    labelValue = input.frameworkId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: frameworkId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{frameworkId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: frameworkId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "frameworkId", function () { return input.frameworkId; }, "{frameworkId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign({}, (input.complianceType != null && { complianceType: input.complianceType })), (input.controlSets != null && {
                     controlSets: serializeAws_restJson1UpdateAssessmentFrameworkControlSets(input.controlSets, context),
                 })), (input.description != null && { description: input.description })), (input.name != null && { name: input.name })));
@@ -1814,7 +1436,7 @@ export var serializeAws_restJson1UpdateAssessmentFrameworkCommand = function (in
     });
 }); };
 export var serializeAws_restJson1UpdateAssessmentFrameworkShareCommand = 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()];
@@ -1825,16 +1447,7 @@ export var serializeAws_restJson1UpdateAssessmentFrameworkShareCommand = functio
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/assessmentFrameworkShareRequests/{requestId}";
-                if (input.requestId !== undefined) {
-                    labelValue = input.requestId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: requestId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{requestId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: requestId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "requestId", function () { return input.requestId; }, "{requestId}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.action != null && { action: input.action })), (input.requestType != null && { requestType: input.requestType })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1849,7 +1462,7 @@ export var serializeAws_restJson1UpdateAssessmentFrameworkShareCommand = functio
     });
 }); };
 export var serializeAws_restJson1UpdateAssessmentStatusCommand = 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()];
@@ -1859,16 +1472,7 @@ export var serializeAws_restJson1UpdateAssessmentStatusCommand = function (input
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/assessments/{assessmentId}/status";
-                if (input.assessmentId !== undefined) {
-                    labelValue = input.assessmentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: assessmentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{assessmentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: assessmentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "assessmentId", function () { return input.assessmentId; }, "{assessmentId}", false);
                 body = JSON.stringify(__assign({}, (input.status != null && { status: input.status })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1883,7 +1487,7 @@ export var serializeAws_restJson1UpdateAssessmentStatusCommand = function (input
     });
 }); };
 export var serializeAws_restJson1UpdateControlCommand = 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()];
@@ -1893,16 +1497,7 @@ export var serializeAws_restJson1UpdateControlCommand = function (input, context
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/controls/{controlId}";
-                if (input.controlId !== undefined) {
-                    labelValue = input.controlId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: controlId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{controlId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: controlId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "controlId", function () { return input.controlId; }, "{controlId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.actionPlanInstructions != null && { actionPlanInstructions: input.actionPlanInstructions })), (input.actionPlanTitle != null && { actionPlanTitle: input.actionPlanTitle })), (input.controlMappingSources != null && {
                     controlMappingSources: serializeAws_restJson1ControlMappingSources(input.controlMappingSources, context),
                 })), (input.description != null && { description: input.description })), (input.name != null && { name: input.name })), (input.testingInformation != null && { testingInformation: input.testingInformation })));
@@ -1978,18 +1573,18 @@ export var deserializeAws_restJson1AssociateAssessmentReportEvidenceFolderComman
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AssociateAssessmentReportEvidenceFolderCommandError(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_restJson1AssociateAssessmentReportEvidenceFolderCommandError = 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) {
@@ -2022,14 +1617,14 @@ var deserializeAws_restJson1AssociateAssessmentReportEvidenceFolderCommandError
             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];
         }
     });
 }); };
@@ -2041,28 +1636,26 @@ export var deserializeAws_restJson1BatchAssociateAssessmentReportEvidenceCommand
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchAssociateAssessmentReportEvidenceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    errors: undefined,
-                    evidenceIds: 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.errors !== undefined && data.errors !== null) {
+                if (data.errors != null) {
                     contents.errors = deserializeAws_restJson1AssessmentReportEvidenceErrors(data.errors, context);
                 }
-                if (data.evidenceIds !== undefined && data.evidenceIds !== null) {
+                if (data.evidenceIds != null) {
                     contents.evidenceIds = deserializeAws_restJson1EvidenceIds(data.evidenceIds, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchAssociateAssessmentReportEvidenceCommandError = 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) {
@@ -2095,14 +1688,14 @@ var deserializeAws_restJson1BatchAssociateAssessmentReportEvidenceCommandError =
             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];
         }
     });
 }); };
@@ -2114,28 +1707,26 @@ export var deserializeAws_restJson1BatchCreateDelegationByAssessmentCommand = fu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchCreateDelegationByAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    delegations: undefined,
-                    errors: 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.delegations !== undefined && data.delegations !== null) {
+                if (data.delegations != null) {
                     contents.delegations = deserializeAws_restJson1Delegations(data.delegations, context);
                 }
-                if (data.errors !== undefined && data.errors !== null) {
+                if (data.errors != null) {
                     contents.errors = deserializeAws_restJson1BatchCreateDelegationByAssessmentErrors(data.errors, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchCreateDelegationByAssessmentCommandError = 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) {
@@ -2168,14 +1759,14 @@ var deserializeAws_restJson1BatchCreateDelegationByAssessmentCommandError = func
             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];
         }
     });
 }); };
@@ -2187,24 +1778,23 @@ export var deserializeAws_restJson1BatchDeleteDelegationByAssessmentCommand = fu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchDeleteDelegationByAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    errors: 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.errors !== undefined && data.errors !== null) {
+                if (data.errors != null) {
                     contents.errors = deserializeAws_restJson1BatchDeleteDelegationByAssessmentErrors(data.errors, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchDeleteDelegationByAssessmentCommandError = 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) {
@@ -2237,14 +1827,14 @@ var deserializeAws_restJson1BatchDeleteDelegationByAssessmentCommandError = func
             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];
         }
     });
 }); };
@@ -2256,28 +1846,26 @@ export var deserializeAws_restJson1BatchDisassociateAssessmentReportEvidenceComm
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchDisassociateAssessmentReportEvidenceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    errors: undefined,
-                    evidenceIds: 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.errors !== undefined && data.errors !== null) {
+                if (data.errors != null) {
                     contents.errors = deserializeAws_restJson1AssessmentReportEvidenceErrors(data.errors, context);
                 }
-                if (data.evidenceIds !== undefined && data.evidenceIds !== null) {
+                if (data.evidenceIds != null) {
                     contents.evidenceIds = deserializeAws_restJson1EvidenceIds(data.evidenceIds, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchDisassociateAssessmentReportEvidenceCommandError = 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) {
@@ -2310,14 +1898,14 @@ var deserializeAws_restJson1BatchDisassociateAssessmentReportEvidenceCommandErro
             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];
         }
     });
 }); };
@@ -2329,24 +1917,23 @@ export var deserializeAws_restJson1BatchImportEvidenceToAssessmentControlCommand
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchImportEvidenceToAssessmentControlCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    errors: 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.errors !== undefined && data.errors !== null) {
+                if (data.errors != null) {
                     contents.errors = deserializeAws_restJson1BatchImportEvidenceToAssessmentControlErrors(data.errors, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchImportEvidenceToAssessmentControlCommandError = 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) {
@@ -2379,14 +1966,14 @@ var deserializeAws_restJson1BatchImportEvidenceToAssessmentControlCommandError =
             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];
         }
     });
 }); };
@@ -2398,24 +1985,23 @@ export var deserializeAws_restJson1CreateAssessmentCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessment: 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.assessment !== undefined && data.assessment !== null) {
+                if (data.assessment != null) {
                     contents.assessment = deserializeAws_restJson1Assessment(data.assessment, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateAssessmentCommandError = 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) {
@@ -2452,14 +2038,14 @@ var deserializeAws_restJson1CreateAssessmentCommandError = function (output, con
             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];
         }
     });
 }); };
@@ -2471,24 +2057,23 @@ export var deserializeAws_restJson1CreateAssessmentFrameworkCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateAssessmentFrameworkCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    framework: 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.framework !== undefined && data.framework !== null) {
+                if (data.framework != null) {
                     contents.framework = deserializeAws_restJson1Framework(data.framework, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateAssessmentFrameworkCommandError = 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) {
@@ -2525,14 +2110,14 @@ var deserializeAws_restJson1CreateAssessmentFrameworkCommandError = function (ou
             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];
         }
     });
 }); };
@@ -2544,24 +2129,23 @@ export var deserializeAws_restJson1CreateAssessmentReportCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateAssessmentReportCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessmentReport: 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.assessmentReport !== undefined && data.assessmentReport !== null) {
+                if (data.assessmentReport != null) {
                     contents.assessmentReport = deserializeAws_restJson1AssessmentReport(data.assessmentReport, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateAssessmentReportCommandError = 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) {
@@ -2594,14 +2178,14 @@ var deserializeAws_restJson1CreateAssessmentReportCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -2613,24 +2197,23 @@ export var deserializeAws_restJson1CreateControlCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateControlCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    control: 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.control !== undefined && data.control !== null) {
+                if (data.control != null) {
                     contents.control = deserializeAws_restJson1Control(data.control, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateControlCommandError = 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) {
@@ -2667,14 +2250,14 @@ var deserializeAws_restJson1CreateControlCommandError = 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];
         }
     });
 }); };
@@ -2686,18 +2269,18 @@ export var deserializeAws_restJson1DeleteAssessmentCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteAssessmentCommandError(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_restJson1DeleteAssessmentCommandError = 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) {
@@ -2730,14 +2313,14 @@ var deserializeAws_restJson1DeleteAssessmentCommandError = 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];
         }
     });
 }); };
@@ -2749,18 +2332,18 @@ export var deserializeAws_restJson1DeleteAssessmentFrameworkCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteAssessmentFrameworkCommandError(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_restJson1DeleteAssessmentFrameworkCommandError = 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) {
@@ -2793,14 +2376,14 @@ var deserializeAws_restJson1DeleteAssessmentFrameworkCommandError = function (ou
             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];
         }
     });
 }); };
@@ -2812,18 +2395,18 @@ export var deserializeAws_restJson1DeleteAssessmentFrameworkShareCommand = funct
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteAssessmentFrameworkShareCommandError(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_restJson1DeleteAssessmentFrameworkShareCommandError = 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) {
@@ -2856,14 +2439,14 @@ var deserializeAws_restJson1DeleteAssessmentFrameworkShareCommandError = functio
             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];
         }
     });
 }); };
@@ -2875,18 +2458,18 @@ export var deserializeAws_restJson1DeleteAssessmentReportCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteAssessmentReportCommandError(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_restJson1DeleteAssessmentReportCommandError = 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) {
@@ -2919,14 +2502,14 @@ var deserializeAws_restJson1DeleteAssessmentReportCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -2938,18 +2521,18 @@ export var deserializeAws_restJson1DeleteControlCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteControlCommandError(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_restJson1DeleteControlCommandError = 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) {
@@ -2982,14 +2565,14 @@ var deserializeAws_restJson1DeleteControlCommandError = function (output, contex
             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];
         }
     });
 }); };
@@ -3001,24 +2584,23 @@ export var deserializeAws_restJson1DeregisterAccountCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeregisterAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    status: 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.status !== undefined && data.status !== null) {
+                if (data.status != null) {
                     contents.status = __expectString(data.status);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeregisterAccountCommandError = 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) {
@@ -3051,14 +2633,14 @@ var deserializeAws_restJson1DeregisterAccountCommandError = 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];
         }
     });
 }); };
@@ -3070,18 +2652,18 @@ export var deserializeAws_restJson1DeregisterOrganizationAdminAccountCommand = f
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeregisterOrganizationAdminAccountCommandError(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_restJson1DeregisterOrganizationAdminAccountCommandError = 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) {
@@ -3114,14 +2696,14 @@ var deserializeAws_restJson1DeregisterOrganizationAdminAccountCommandError = fun
             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];
         }
     });
 }); };
@@ -3133,18 +2715,18 @@ export var deserializeAws_restJson1DisassociateAssessmentReportEvidenceFolderCom
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateAssessmentReportEvidenceFolderCommandError(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_restJson1DisassociateAssessmentReportEvidenceFolderCommandError = 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) {
@@ -3177,14 +2759,14 @@ var deserializeAws_restJson1DisassociateAssessmentReportEvidenceFolderCommandErr
             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];
         }
     });
 }); };
@@ -3196,24 +2778,23 @@ export var deserializeAws_restJson1GetAccountStatusCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetAccountStatusCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    status: 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.status !== undefined && data.status !== null) {
+                if (data.status != null) {
                     contents.status = __expectString(data.status);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetAccountStatusCommandError = 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) {
@@ -3234,14 +2815,14 @@ var deserializeAws_restJson1GetAccountStatusCommandError = function (output, con
             case 3: throw _d.sent();
             case 4:
                 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 = 5;
+            case 5: return [2];
         }
     });
 }); };
@@ -3253,28 +2834,26 @@ export var deserializeAws_restJson1GetAssessmentCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessment: undefined,
-                    userRole: 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.assessment !== undefined && data.assessment !== null) {
+                if (data.assessment != null) {
                     contents.assessment = deserializeAws_restJson1Assessment(data.assessment, context);
                 }
-                if (data.userRole !== undefined && data.userRole !== null) {
+                if (data.userRole != null) {
                     contents.userRole = deserializeAws_restJson1Role(data.userRole, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetAssessmentCommandError = 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) {
@@ -3307,14 +2886,14 @@ var deserializeAws_restJson1GetAssessmentCommandError = function (output, contex
             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];
         }
     });
 }); };
@@ -3326,24 +2905,23 @@ export var deserializeAws_restJson1GetAssessmentFrameworkCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetAssessmentFrameworkCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    framework: 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.framework !== undefined && data.framework !== null) {
+                if (data.framework != null) {
                     contents.framework = deserializeAws_restJson1Framework(data.framework, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetAssessmentFrameworkCommandError = 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) {
@@ -3376,14 +2954,14 @@ var deserializeAws_restJson1GetAssessmentFrameworkCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -3395,24 +2973,23 @@ export var deserializeAws_restJson1GetAssessmentReportUrlCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetAssessmentReportUrlCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    preSignedUrl: 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.preSignedUrl !== undefined && data.preSignedUrl !== null) {
+                if (data.preSignedUrl != null) {
                     contents.preSignedUrl = deserializeAws_restJson1URL(data.preSignedUrl, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetAssessmentReportUrlCommandError = 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) {
@@ -3445,14 +3022,14 @@ var deserializeAws_restJson1GetAssessmentReportUrlCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -3464,28 +3041,26 @@ export var deserializeAws_restJson1GetChangeLogsCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetChangeLogsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    changeLogs: 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.changeLogs !== undefined && data.changeLogs !== null) {
+                if (data.changeLogs != null) {
                     contents.changeLogs = deserializeAws_restJson1ChangeLogs(data.changeLogs, 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_restJson1GetChangeLogsCommandError = 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) {
@@ -3518,14 +3093,14 @@ var deserializeAws_restJson1GetChangeLogsCommandError = function (output, contex
             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];
         }
     });
 }); };
@@ -3537,24 +3112,23 @@ export var deserializeAws_restJson1GetControlCommand = function (output, context
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetControlCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    control: 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.control !== undefined && data.control !== null) {
+                if (data.control != null) {
                     contents.control = deserializeAws_restJson1Control(data.control, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetControlCommandError = 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) {
@@ -3587,14 +3161,14 @@ var deserializeAws_restJson1GetControlCommandError = 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];
         }
     });
 }); };
@@ -3606,28 +3180,26 @@ export var deserializeAws_restJson1GetDelegationsCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetDelegationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    delegations: 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.delegations !== undefined && data.delegations !== null) {
+                if (data.delegations != null) {
                     contents.delegations = deserializeAws_restJson1DelegationMetadataList(data.delegations, 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_restJson1GetDelegationsCommandError = 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) {
@@ -3656,14 +3228,14 @@ var deserializeAws_restJson1GetDelegationsCommandError = function (output, conte
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -3675,24 +3247,23 @@ export var deserializeAws_restJson1GetEvidenceCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetEvidenceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    evidence: 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.evidence !== undefined && data.evidence !== null) {
+                if (data.evidence != null) {
                     contents.evidence = deserializeAws_restJson1Evidence(data.evidence, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetEvidenceCommandError = 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) {
@@ -3725,14 +3296,14 @@ var deserializeAws_restJson1GetEvidenceCommandError = 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];
         }
     });
 }); };
@@ -3744,28 +3315,26 @@ export var deserializeAws_restJson1GetEvidenceByEvidenceFolderCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetEvidenceByEvidenceFolderCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    evidence: 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.evidence !== undefined && data.evidence !== null) {
+                if (data.evidence != null) {
                     contents.evidence = deserializeAws_restJson1EvidenceList(data.evidence, 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_restJson1GetEvidenceByEvidenceFolderCommandError = 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) {
@@ -3798,14 +3367,14 @@ var deserializeAws_restJson1GetEvidenceByEvidenceFolderCommandError = function (
             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];
         }
     });
 }); };
@@ -3817,24 +3386,23 @@ export var deserializeAws_restJson1GetEvidenceFolderCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetEvidenceFolderCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    evidenceFolder: 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.evidenceFolder !== undefined && data.evidenceFolder !== null) {
+                if (data.evidenceFolder != null) {
                     contents.evidenceFolder = deserializeAws_restJson1AssessmentEvidenceFolder(data.evidenceFolder, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetEvidenceFolderCommandError = 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) {
@@ -3867,14 +3435,14 @@ var deserializeAws_restJson1GetEvidenceFolderCommandError = 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];
         }
     });
 }); };
@@ -3886,28 +3454,26 @@ export var deserializeAws_restJson1GetEvidenceFoldersByAssessmentCommand = funct
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetEvidenceFoldersByAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    evidenceFolders: 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.evidenceFolders !== undefined && data.evidenceFolders !== null) {
+                if (data.evidenceFolders != null) {
                     contents.evidenceFolders = deserializeAws_restJson1AssessmentEvidenceFolders(data.evidenceFolders, 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_restJson1GetEvidenceFoldersByAssessmentCommandError = 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) {
@@ -3940,14 +3506,14 @@ var deserializeAws_restJson1GetEvidenceFoldersByAssessmentCommandError = functio
             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];
         }
     });
 }); };
@@ -3959,28 +3525,26 @@ export var deserializeAws_restJson1GetEvidenceFoldersByAssessmentControlCommand
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetEvidenceFoldersByAssessmentControlCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    evidenceFolders: 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.evidenceFolders !== undefined && data.evidenceFolders !== null) {
+                if (data.evidenceFolders != null) {
                     contents.evidenceFolders = deserializeAws_restJson1AssessmentEvidenceFolders(data.evidenceFolders, 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_restJson1GetEvidenceFoldersByAssessmentControlCommandError = 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) {
@@ -4013,14 +3577,14 @@ var deserializeAws_restJson1GetEvidenceFoldersByAssessmentControlCommandError =
             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];
         }
     });
 }); };
@@ -4032,24 +3596,23 @@ export var deserializeAws_restJson1GetInsightsCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetInsightsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    insights: 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.insights !== undefined && data.insights !== null) {
+                if (data.insights != null) {
                     contents.insights = deserializeAws_restJson1Insights(data.insights, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetInsightsCommandError = 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) {
@@ -4074,14 +3637,14 @@ var deserializeAws_restJson1GetInsightsCommandError = function (output, context)
             case 5: throw _d.sent();
             case 6:
                 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 = 7;
+            case 7: return [2];
         }
     });
 }); };
@@ -4093,24 +3656,23 @@ export var deserializeAws_restJson1GetInsightsByAssessmentCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetInsightsByAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    insights: 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.insights !== undefined && data.insights !== null) {
+                if (data.insights != null) {
                     contents.insights = deserializeAws_restJson1InsightsByAssessment(data.insights, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetInsightsByAssessmentCommandError = 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) {
@@ -4143,14 +3705,14 @@ var deserializeAws_restJson1GetInsightsByAssessmentCommandError = function (outp
             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];
         }
     });
 }); };
@@ -4162,28 +3724,26 @@ export var deserializeAws_restJson1GetOrganizationAdminAccountCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetOrganizationAdminAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    adminAccountId: undefined,
-                    organizationId: 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.adminAccountId !== undefined && data.adminAccountId !== null) {
+                if (data.adminAccountId != null) {
                     contents.adminAccountId = __expectString(data.adminAccountId);
                 }
-                if (data.organizationId !== undefined && data.organizationId !== null) {
+                if (data.organizationId != null) {
                     contents.organizationId = __expectString(data.organizationId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetOrganizationAdminAccountCommandError = 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) {
@@ -4216,14 +3776,14 @@ var deserializeAws_restJson1GetOrganizationAdminAccountCommandError = function (
             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];
         }
     });
 }); };
@@ -4235,24 +3795,23 @@ export var deserializeAws_restJson1GetServicesInScopeCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetServicesInScopeCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    serviceMetadata: 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.serviceMetadata !== undefined && data.serviceMetadata !== null) {
+                if (data.serviceMetadata != null) {
                     contents.serviceMetadata = deserializeAws_restJson1ServiceMetadataList(data.serviceMetadata, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetServicesInScopeCommandError = 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) {
@@ -4281,14 +3840,14 @@ var deserializeAws_restJson1GetServicesInScopeCommandError = function (output, c
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -4300,24 +3859,23 @@ export var deserializeAws_restJson1GetSettingsCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    settings: 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.settings !== undefined && data.settings !== null) {
+                if (data.settings != null) {
                     contents.settings = deserializeAws_restJson1Settings(data.settings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetSettingsCommandError = 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) {
@@ -4342,14 +3900,14 @@ var deserializeAws_restJson1GetSettingsCommandError = function (output, context)
             case 5: throw _d.sent();
             case 6:
                 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 = 7;
+            case 7: return [2];
         }
     });
 }); };
@@ -4361,28 +3919,26 @@ export var deserializeAws_restJson1ListAssessmentControlInsightsByControlDomainC
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListAssessmentControlInsightsByControlDomainCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    controlInsightsByAssessment: 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.controlInsightsByAssessment !== undefined && data.controlInsightsByAssessment !== null) {
+                if (data.controlInsightsByAssessment != null) {
                     contents.controlInsightsByAssessment = deserializeAws_restJson1ControlInsightsMetadataByAssessment(data.controlInsightsByAssessment, 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_restJson1ListAssessmentControlInsightsByControlDomainCommandError = 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) {
@@ -4415,14 +3971,14 @@ var deserializeAws_restJson1ListAssessmentControlInsightsByControlDomainCommandE
             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];
         }
     });
 }); };
@@ -4434,28 +3990,26 @@ export var deserializeAws_restJson1ListAssessmentFrameworksCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListAssessmentFrameworksCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    frameworkMetadataList: 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.frameworkMetadataList !== undefined && data.frameworkMetadataList !== null) {
+                if (data.frameworkMetadataList != null) {
                     contents.frameworkMetadataList = deserializeAws_restJson1FrameworkMetadataList(data.frameworkMetadataList, 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_restJson1ListAssessmentFrameworksCommandError = 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) {
@@ -4484,14 +4038,14 @@ var deserializeAws_restJson1ListAssessmentFrameworksCommandError = function (out
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -4503,28 +4057,26 @@ export var deserializeAws_restJson1ListAssessmentFrameworkShareRequestsCommand =
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListAssessmentFrameworkShareRequestsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessmentFrameworkShareRequests: 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.assessmentFrameworkShareRequests !== undefined && data.assessmentFrameworkShareRequests !== null) {
+                if (data.assessmentFrameworkShareRequests != null) {
                     contents.assessmentFrameworkShareRequests = deserializeAws_restJson1AssessmentFrameworkShareRequestList(data.assessmentFrameworkShareRequests, 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_restJson1ListAssessmentFrameworkShareRequestsCommandError = 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) {
@@ -4553,14 +4105,14 @@ var deserializeAws_restJson1ListAssessmentFrameworkShareRequestsCommandError = f
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -4572,28 +4124,26 @@ export var deserializeAws_restJson1ListAssessmentReportsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListAssessmentReportsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessmentReports: 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.assessmentReports !== undefined && data.assessmentReports !== null) {
+                if (data.assessmentReports != null) {
                     contents.assessmentReports = deserializeAws_restJson1AssessmentReportsMetadata(data.assessmentReports, 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_restJson1ListAssessmentReportsCommandError = 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) {
@@ -4622,14 +4172,14 @@ var deserializeAws_restJson1ListAssessmentReportsCommandError = function (output
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -4641,28 +4191,26 @@ export var deserializeAws_restJson1ListAssessmentsCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListAssessmentsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessmentMetadata: 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.assessmentMetadata !== undefined && data.assessmentMetadata !== null) {
+                if (data.assessmentMetadata != null) {
                     contents.assessmentMetadata = deserializeAws_restJson1ListAssessmentMetadata(data.assessmentMetadata, 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_restJson1ListAssessmentsCommandError = 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) {
@@ -4691,14 +4239,14 @@ var deserializeAws_restJson1ListAssessmentsCommandError = function (output, cont
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -4710,28 +4258,26 @@ export var deserializeAws_restJson1ListControlDomainInsightsCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListControlDomainInsightsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    controlDomainInsights: 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.controlDomainInsights !== undefined && data.controlDomainInsights !== null) {
+                if (data.controlDomainInsights != null) {
                     contents.controlDomainInsights = deserializeAws_restJson1ControlDomainInsightsList(data.controlDomainInsights, 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_restJson1ListControlDomainInsightsCommandError = 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) {
@@ -4764,14 +4310,14 @@ var deserializeAws_restJson1ListControlDomainInsightsCommandError = function (ou
             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];
         }
     });
 }); };
@@ -4783,28 +4329,26 @@ export var deserializeAws_restJson1ListControlDomainInsightsByAssessmentCommand
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListControlDomainInsightsByAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    controlDomainInsights: 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.controlDomainInsights !== undefined && data.controlDomainInsights !== null) {
+                if (data.controlDomainInsights != null) {
                     contents.controlDomainInsights = deserializeAws_restJson1ControlDomainInsightsList(data.controlDomainInsights, 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_restJson1ListControlDomainInsightsByAssessmentCommandError = 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) {
@@ -4837,14 +4381,14 @@ var deserializeAws_restJson1ListControlDomainInsightsByAssessmentCommandError =
             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];
         }
     });
 }); };
@@ -4856,28 +4400,26 @@ export var deserializeAws_restJson1ListControlInsightsByControlDomainCommand = f
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListControlInsightsByControlDomainCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    controlInsightsMetadata: 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.controlInsightsMetadata !== undefined && data.controlInsightsMetadata !== null) {
+                if (data.controlInsightsMetadata != null) {
                     contents.controlInsightsMetadata = deserializeAws_restJson1ControlInsightsMetadata(data.controlInsightsMetadata, 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_restJson1ListControlInsightsByControlDomainCommandError = 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) {
@@ -4910,14 +4452,14 @@ var deserializeAws_restJson1ListControlInsightsByControlDomainCommandError = fun
             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];
         }
     });
 }); };
@@ -4929,28 +4471,26 @@ export var deserializeAws_restJson1ListControlsCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListControlsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    controlMetadataList: 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.controlMetadataList !== undefined && data.controlMetadataList !== null) {
+                if (data.controlMetadataList != null) {
                     contents.controlMetadataList = deserializeAws_restJson1ControlMetadataList(data.controlMetadataList, 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_restJson1ListControlsCommandError = 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) {
@@ -4979,14 +4519,14 @@ var deserializeAws_restJson1ListControlsCommandError = function (output, context
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -4998,28 +4538,26 @@ export var deserializeAws_restJson1ListKeywordsForDataSourceCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListKeywordsForDataSourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    keywords: 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.keywords !== undefined && data.keywords !== null) {
+                if (data.keywords != null) {
                     contents.keywords = deserializeAws_restJson1Keywords(data.keywords, 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_restJson1ListKeywordsForDataSourceCommandError = 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) {
@@ -5048,14 +4586,14 @@ var deserializeAws_restJson1ListKeywordsForDataSourceCommandError = function (ou
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -5067,28 +4605,26 @@ export var deserializeAws_restJson1ListNotificationsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListNotificationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    notifications: 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.notifications !== undefined && data.notifications !== null) {
+                if (data.notifications != null) {
                     contents.notifications = deserializeAws_restJson1Notifications(data.notifications, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListNotificationsCommandError = 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) {
@@ -5117,14 +4653,14 @@ var deserializeAws_restJson1ListNotificationsCommandError = function (output, co
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -5136,24 +4672,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_restJson1TagMap(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, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5182,14 +4717,14 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -5201,24 +4736,23 @@ export var deserializeAws_restJson1RegisterAccountCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1RegisterAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    status: 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.status !== undefined && data.status !== null) {
+                if (data.status != null) {
                     contents.status = __expectString(data.status);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1RegisterAccountCommandError = 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) {
@@ -5255,14 +4789,14 @@ var deserializeAws_restJson1RegisterAccountCommandError = function (output, cont
             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];
         }
     });
 }); };
@@ -5274,28 +4808,26 @@ export var deserializeAws_restJson1RegisterOrganizationAdminAccountCommand = fun
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1RegisterOrganizationAdminAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    adminAccountId: undefined,
-                    organizationId: 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.adminAccountId !== undefined && data.adminAccountId !== null) {
+                if (data.adminAccountId != null) {
                     contents.adminAccountId = __expectString(data.adminAccountId);
                 }
-                if (data.organizationId !== undefined && data.organizationId !== null) {
+                if (data.organizationId != null) {
                     contents.organizationId = __expectString(data.organizationId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1RegisterOrganizationAdminAccountCommandError = 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) {
@@ -5328,14 +4860,14 @@ var deserializeAws_restJson1RegisterOrganizationAdminAccountCommandError = funct
             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];
         }
     });
 }); };
@@ -5347,24 +4879,23 @@ export var deserializeAws_restJson1StartAssessmentFrameworkShareCommand = functi
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StartAssessmentFrameworkShareCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessmentFrameworkShareRequest: 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.assessmentFrameworkShareRequest !== undefined && data.assessmentFrameworkShareRequest !== null) {
+                if (data.assessmentFrameworkShareRequest != null) {
                     contents.assessmentFrameworkShareRequest = deserializeAws_restJson1AssessmentFrameworkShareRequest(data.assessmentFrameworkShareRequest, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1StartAssessmentFrameworkShareCommandError = 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) {
@@ -5397,14 +4928,14 @@ var deserializeAws_restJson1StartAssessmentFrameworkShareCommandError = function
             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];
         }
     });
 }); };
@@ -5416,18 +4947,18 @@ export var deserializeAws_restJson1TagResourceCommand = function (output, contex
                 if (output.statusCode !== 200 && 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, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5456,14 +4987,14 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -5475,18 +5006,18 @@ export var deserializeAws_restJson1UntagResourceCommand = function (output, cont
                 if (output.statusCode !== 200 && 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, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -5515,14 +5046,14 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -5534,24 +5065,23 @@ export var deserializeAws_restJson1UpdateAssessmentCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessment: 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.assessment !== undefined && data.assessment !== null) {
+                if (data.assessment != null) {
                     contents.assessment = deserializeAws_restJson1Assessment(data.assessment, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateAssessmentCommandError = 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) {
@@ -5584,14 +5114,14 @@ var deserializeAws_restJson1UpdateAssessmentCommandError = 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];
         }
     });
 }); };
@@ -5603,24 +5133,23 @@ export var deserializeAws_restJson1UpdateAssessmentControlCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateAssessmentControlCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    control: 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.control !== undefined && data.control !== null) {
+                if (data.control != null) {
                     contents.control = deserializeAws_restJson1AssessmentControl(data.control, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateAssessmentControlCommandError = 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) {
@@ -5653,14 +5182,14 @@ var deserializeAws_restJson1UpdateAssessmentControlCommandError = function (outp
             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];
         }
     });
 }); };
@@ -5672,24 +5201,23 @@ export var deserializeAws_restJson1UpdateAssessmentControlSetStatusCommand = fun
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateAssessmentControlSetStatusCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    controlSet: 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.controlSet !== undefined && data.controlSet !== null) {
+                if (data.controlSet != null) {
                     contents.controlSet = deserializeAws_restJson1AssessmentControlSet(data.controlSet, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateAssessmentControlSetStatusCommandError = 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) {
@@ -5722,14 +5250,14 @@ var deserializeAws_restJson1UpdateAssessmentControlSetStatusCommandError = funct
             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];
         }
     });
 }); };
@@ -5741,24 +5269,23 @@ export var deserializeAws_restJson1UpdateAssessmentFrameworkCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateAssessmentFrameworkCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    framework: 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.framework !== undefined && data.framework !== null) {
+                if (data.framework != null) {
                     contents.framework = deserializeAws_restJson1Framework(data.framework, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateAssessmentFrameworkCommandError = 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) {
@@ -5791,14 +5318,14 @@ var deserializeAws_restJson1UpdateAssessmentFrameworkCommandError = function (ou
             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];
         }
     });
 }); };
@@ -5810,24 +5337,23 @@ export var deserializeAws_restJson1UpdateAssessmentFrameworkShareCommand = funct
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateAssessmentFrameworkShareCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessmentFrameworkShareRequest: 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.assessmentFrameworkShareRequest !== undefined && data.assessmentFrameworkShareRequest !== null) {
+                if (data.assessmentFrameworkShareRequest != null) {
                     contents.assessmentFrameworkShareRequest = deserializeAws_restJson1AssessmentFrameworkShareRequest(data.assessmentFrameworkShareRequest, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateAssessmentFrameworkShareCommandError = 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) {
@@ -5860,14 +5386,14 @@ var deserializeAws_restJson1UpdateAssessmentFrameworkShareCommandError = functio
             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];
         }
     });
 }); };
@@ -5879,24 +5405,23 @@ export var deserializeAws_restJson1UpdateAssessmentStatusCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateAssessmentStatusCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessment: 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.assessment !== undefined && data.assessment !== null) {
+                if (data.assessment != null) {
                     contents.assessment = deserializeAws_restJson1Assessment(data.assessment, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateAssessmentStatusCommandError = 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) {
@@ -5933,14 +5458,14 @@ var deserializeAws_restJson1UpdateAssessmentStatusCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -5952,24 +5477,23 @@ export var deserializeAws_restJson1UpdateControlCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateControlCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    control: 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.control !== undefined && data.control !== null) {
+                if (data.control != null) {
                     contents.control = deserializeAws_restJson1Control(data.control, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateControlCommandError = 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) {
@@ -6002,14 +5526,14 @@ var deserializeAws_restJson1UpdateControlCommandError = function (output, contex
             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];
         }
     });
 }); };
@@ -6021,24 +5545,23 @@ export var deserializeAws_restJson1UpdateSettingsCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    settings: 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.settings !== undefined && data.settings !== null) {
+                if (data.settings != null) {
                     contents.settings = deserializeAws_restJson1Settings(data.settings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateSettingsCommandError = 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) {
@@ -6067,14 +5590,14 @@ var deserializeAws_restJson1UpdateSettingsCommandError = function (output, conte
             case 7: throw _d.sent();
             case 8:
                 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 = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -6086,40 +5609,35 @@ export var deserializeAws_restJson1ValidateAssessmentReportIntegrityCommand = fu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ValidateAssessmentReportIntegrityCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    signatureAlgorithm: undefined,
-                    signatureDateTime: undefined,
-                    signatureKeyId: undefined,
-                    signatureValid: undefined,
-                    validationErrors: 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.signatureAlgorithm !== undefined && data.signatureAlgorithm !== null) {
+                if (data.signatureAlgorithm != null) {
                     contents.signatureAlgorithm = __expectString(data.signatureAlgorithm);
                 }
-                if (data.signatureDateTime !== undefined && data.signatureDateTime !== null) {
+                if (data.signatureDateTime != null) {
                     contents.signatureDateTime = __expectString(data.signatureDateTime);
                 }
-                if (data.signatureKeyId !== undefined && data.signatureKeyId !== null) {
+                if (data.signatureKeyId != null) {
                     contents.signatureKeyId = __expectString(data.signatureKeyId);
                 }
-                if (data.signatureValid !== undefined && data.signatureValid !== null) {
+                if (data.signatureValid != null) {
                     contents.signatureValid = __expectBoolean(data.signatureValid);
                 }
-                if (data.validationErrors !== undefined && data.validationErrors !== null) {
+                if (data.validationErrors != null) {
                     contents.validationErrors = deserializeAws_restJson1ValidationErrors(data.validationErrors, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ValidateAssessmentReportIntegrityCommandError = 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) {
@@ -6152,23 +5670,24 @@ var deserializeAws_restJson1ValidateAssessmentReportIntegrityCommandError = func
             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];
         }
     });
 }); };
+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));
@@ -6178,9 +5697,9 @@ var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutp
 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));
@@ -6190,15 +5709,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));
@@ -6208,9 +5727,9 @@ var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsed
 var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = 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 ServiceQuotaExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -6220,9 +5739,9 @@ var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = 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));
@@ -6232,15 +5751,15 @@ 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.fields !== undefined && data.fields !== null) {
+        if (data.fields != null) {
             contents.fields = deserializeAws_restJson1ValidationExceptionFieldList(data.fields, context);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.reason !== undefined && data.reason !== null) {
+        if (data.reason != null) {
             contents.reason = __expectString(data.reason);
         }
         exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -6257,9 +5776,6 @@ var serializeAws_restJson1AWSAccounts = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AWSAccount(entry, context);
     });
 };
@@ -6270,9 +5786,6 @@ var serializeAws_restJson1AWSServices = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AWSService(entry, context);
     });
 };
@@ -6285,9 +5798,6 @@ var serializeAws_restJson1ControlMappingSources = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1ControlMappingSource(entry, context);
     });
 };
@@ -6298,9 +5808,6 @@ var serializeAws_restJson1CreateAssessmentFrameworkControls = function (input, c
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CreateAssessmentFrameworkControl(entry, context);
     });
 };
@@ -6313,9 +5820,6 @@ var serializeAws_restJson1CreateAssessmentFrameworkControlSets = function (input
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CreateAssessmentFrameworkControlSet(entry, context);
     });
 };
@@ -6328,9 +5832,6 @@ var serializeAws_restJson1CreateControlMappingSources = function (input, context
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CreateControlMappingSource(entry, context);
     });
 };
@@ -6341,9 +5842,6 @@ var serializeAws_restJson1CreateDelegationRequests = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CreateDelegationRequest(entry, context);
     });
 };
@@ -6351,9 +5849,6 @@ var serializeAws_restJson1DelegationIds = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -6361,9 +5856,6 @@ var serializeAws_restJson1EvidenceIds = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -6374,9 +5866,6 @@ var serializeAws_restJson1ManualEvidenceList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1ManualEvidence(entry, context);
     });
 };
@@ -6387,9 +5876,6 @@ var serializeAws_restJson1Roles = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1Role(entry, context);
     });
 };
@@ -6418,9 +5904,6 @@ var serializeAws_restJson1UpdateAssessmentFrameworkControlSets = function (input
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1UpdateAssessmentFrameworkControlSet(entry, context);
     });
 };