@aws-sdk/client-macie2 3.141.0 → 3.142.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,6 +1,6 @@
 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, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseRfc3339DateTime as __parseRfc3339DateTime, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, limitedParseDouble as __limitedParseDouble, map as __map, parseRfc3339DateTime as __parseRfc3339DateTime, resolvedPath as __resolvedPath, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
 import { Macie2ServiceException as __BaseException } from "../models/Macie2ServiceException";
 import { AccessDeniedException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, UnprocessableEntityException, ValidationException, } from "../models/models_0";
@@ -242,7 +242,7 @@ export var serializeAws_restJson1DeclineInvitationsCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1DeleteCustomDataIdentifierCommand = 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()];
@@ -250,16 +250,7 @@ export var serializeAws_restJson1DeleteCustomDataIdentifierCommand = function (i
                 _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 || "") + "/custom-data-identifiers/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -273,7 +264,7 @@ export var serializeAws_restJson1DeleteCustomDataIdentifierCommand = function (i
     });
 }); };
 export var serializeAws_restJson1DeleteFindingsFilterCommand = 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()];
@@ -281,16 +272,7 @@ export var serializeAws_restJson1DeleteFindingsFilterCommand = 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 || "") + "/findingsfilters/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -328,7 +310,7 @@ export var serializeAws_restJson1DeleteInvitationsCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1DeleteMemberCommand = 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()];
@@ -336,16 +318,7 @@ export var serializeAws_restJson1DeleteMemberCommand = 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 || "") + "/members/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -385,7 +358,7 @@ export var serializeAws_restJson1DescribeBucketsCommand = function (input, conte
     });
 }); };
 export var serializeAws_restJson1DescribeClassificationJobCommand = 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()];
@@ -393,16 +366,7 @@ export var serializeAws_restJson1DescribeClassificationJobCommand = 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 || "") + "/jobs/{jobId}";
-                if (input.jobId !== undefined) {
-                    labelValue = input.jobId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: jobId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{jobId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: jobId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "jobId", function () { return input.jobId; }, "{jobId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -472,7 +436,9 @@ export var serializeAws_restJson1DisableOrganizationAdminAccountCommand = functi
                 _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 || "") + "/admin";
-                query = __assign({}, (input.adminAccountId !== undefined && { adminAccountId: input.adminAccountId }));
+                query = map({
+                    adminAccountId: [, input.adminAccountId],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -535,7 +501,7 @@ export var serializeAws_restJson1DisassociateFromMasterAccountCommand = function
     });
 }); };
 export var serializeAws_restJson1DisassociateMemberCommand = 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()];
@@ -543,16 +509,7 @@ export var serializeAws_restJson1DisassociateMemberCommand = function (input, co
                 _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 || "") + "/members/disassociate/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -688,7 +645,7 @@ export var serializeAws_restJson1GetClassificationExportConfigurationCommand = f
     });
 }); };
 export var serializeAws_restJson1GetCustomDataIdentifierCommand = 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()];
@@ -696,16 +653,7 @@ export var serializeAws_restJson1GetCustomDataIdentifierCommand = 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 || "") + "/custom-data-identifiers/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -745,7 +693,7 @@ export var serializeAws_restJson1GetFindingsCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1GetFindingsFilterCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -753,16 +701,7 @@ export var serializeAws_restJson1GetFindingsFilterCommand = 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 || "") + "/findingsfilters/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -900,7 +839,7 @@ export var serializeAws_restJson1GetMasterAccountCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1GetMemberCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -908,16 +847,7 @@ export var serializeAws_restJson1GetMemberCommand = 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 || "") + "/members/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -955,7 +885,7 @@ export var serializeAws_restJson1GetRevealConfigurationCommand = function (input
     });
 }); };
 export var serializeAws_restJson1GetSensitiveDataOccurrencesCommand = 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()];
@@ -963,16 +893,7 @@ export var serializeAws_restJson1GetSensitiveDataOccurrencesCommand = function (
                 _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 || "") + "/findings/{findingId}/reveal";
-                if (input.findingId !== undefined) {
-                    labelValue = input.findingId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: findingId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{findingId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: findingId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "findingId", function () { return input.findingId; }, "{findingId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -986,7 +907,7 @@ export var serializeAws_restJson1GetSensitiveDataOccurrencesCommand = function (
     });
 }); };
 export var serializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand = 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()];
@@ -994,16 +915,7 @@ export var serializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand
                 _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 || "") + "/findings/{findingId}/reveal/availability";
-                if (input.findingId !== undefined) {
-                    labelValue = input.findingId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: findingId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{findingId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: findingId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "findingId", function () { return input.findingId; }, "{findingId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1051,7 +963,9 @@ export var serializeAws_restJson1GetUsageTotalsCommand = 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 || "") + "/usage";
-                query = __assign({}, (input.timeRange !== undefined && { timeRange: input.timeRange }));
+                query = map({
+                    timeRange: [, input.timeRange],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1154,7 +1068,10 @@ export var serializeAws_restJson1ListFindingsFiltersCommand = 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 || "") + "/findingsfilters";
-                query = __assign(__assign({}, (input.maxResults !== undefined && { maxResults: input.maxResults.toString() })), (input.nextToken !== undefined && { nextToken: input.nextToken }));
+                query = map({
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                    nextToken: [, input.nextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1177,7 +1094,10 @@ export var serializeAws_restJson1ListInvitationsCommand = 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 || "") + "/invitations";
-                query = __assign(__assign({}, (input.maxResults !== undefined && { maxResults: input.maxResults.toString() })), (input.nextToken !== undefined && { nextToken: input.nextToken }));
+                query = map({
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                    nextToken: [, input.nextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1224,7 +1144,11 @@ export var serializeAws_restJson1ListMembersCommand = 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 || "") + "/members";
-                query = __assign(__assign(__assign({}, (input.maxResults !== undefined && { maxResults: input.maxResults.toString() })), (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.onlyAssociated !== undefined && { onlyAssociated: input.onlyAssociated }));
+                query = map({
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                    nextToken: [, input.nextToken],
+                    onlyAssociated: [, input.onlyAssociated],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1247,7 +1171,10 @@ export var serializeAws_restJson1ListOrganizationAdminAccountsCommand = function
                 _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 || "") + "/admin";
-                query = __assign(__assign({}, (input.maxResults !== undefined && { maxResults: input.maxResults.toString() })), (input.nextToken !== undefined && { nextToken: input.nextToken }));
+                query = map({
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                    nextToken: [, input.nextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1262,7 +1189,7 @@ export var serializeAws_restJson1ListOrganizationAdminAccountsCommand = function
     });
 }); };
 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()];
@@ -1270,16 +1197,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,
@@ -1374,7 +1292,7 @@ export var serializeAws_restJson1SearchResourcesCommand = function (input, conte
     });
 }); };
 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()];
@@ -1384,16 +1302,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,
@@ -1434,7 +1343,7 @@ export var serializeAws_restJson1TestCustomDataIdentifierCommand = function (inp
     });
 }); };
 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()];
@@ -1442,17 +1351,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,
@@ -1467,7 +1369,7 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1UpdateClassificationJobCommand = 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()];
@@ -1477,16 +1379,7 @@ export var serializeAws_restJson1UpdateClassificationJobCommand = function (inpu
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/jobs/{jobId}";
-                if (input.jobId !== undefined) {
-                    labelValue = input.jobId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: jobId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{jobId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: jobId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "jobId", function () { return input.jobId; }, "{jobId}", false);
                 body = JSON.stringify(__assign({}, (input.jobStatus != null && { jobStatus: input.jobStatus })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1501,7 +1394,7 @@ export var serializeAws_restJson1UpdateClassificationJobCommand = function (inpu
     });
 }); };
 export var serializeAws_restJson1UpdateFindingsFilterCommand = 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;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1512,16 +1405,7 @@ export var serializeAws_restJson1UpdateFindingsFilterCommand = function (input,
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/findingsfilters/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.action != null && { action: input.action })), { clientToken: (_c = input.clientToken) !== null && _c !== void 0 ? _c : generateIdempotencyToken() }), (input.description != null && { description: input.description })), (input.findingCriteria != null && {
                     findingCriteria: serializeAws_restJson1FindingCriteria(input.findingCriteria, context),
                 })), (input.name != null && { name: input.name })), (input.position != null && { position: input.position })));
@@ -1562,7 +1446,7 @@ export var serializeAws_restJson1UpdateMacieSessionCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1UpdateMemberSessionCommand = 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()];
@@ -1572,16 +1456,7 @@ export var serializeAws_restJson1UpdateMemberSessionCommand = function (input, c
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/macie/members/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 body = JSON.stringify(__assign({}, (input.status != null && { status: input.status })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1653,18 +1528,18 @@ export var deserializeAws_restJson1AcceptInvitationCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AcceptInvitationCommandError(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_restJson1AcceptInvitationCommandError = 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) {
@@ -1709,14 +1584,14 @@ var deserializeAws_restJson1AcceptInvitationCommandError = function (output, con
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1728,28 +1603,26 @@ export var deserializeAws_restJson1BatchGetCustomDataIdentifiersCommand = functi
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchGetCustomDataIdentifiersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    customDataIdentifiers: undefined,
-                    notFoundIdentifierIds: 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.customDataIdentifiers !== undefined && data.customDataIdentifiers !== null) {
+                if (data.customDataIdentifiers != null) {
                     contents.customDataIdentifiers = deserializeAws_restJson1__listOfBatchGetCustomDataIdentifierSummary(data.customDataIdentifiers, context);
                 }
-                if (data.notFoundIdentifierIds !== undefined && data.notFoundIdentifierIds !== null) {
+                if (data.notFoundIdentifierIds != null) {
                     contents.notFoundIdentifierIds = deserializeAws_restJson1__listOf__string(data.notFoundIdentifierIds, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchGetCustomDataIdentifiersCommandError = 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) {
@@ -1794,14 +1667,14 @@ var deserializeAws_restJson1BatchGetCustomDataIdentifiersCommandError = function
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1813,28 +1686,26 @@ export var deserializeAws_restJson1CreateClassificationJobCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateClassificationJobCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    jobArn: undefined,
-                    jobId: 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.jobArn !== undefined && data.jobArn !== null) {
+                if (data.jobArn != null) {
                     contents.jobArn = __expectString(data.jobArn);
                 }
-                if (data.jobId !== undefined && data.jobId !== null) {
+                if (data.jobId != null) {
                     contents.jobId = __expectString(data.jobId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateClassificationJobCommandError = 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) {
@@ -1879,14 +1750,14 @@ var deserializeAws_restJson1CreateClassificationJobCommandError = function (outp
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1898,24 +1769,23 @@ export var deserializeAws_restJson1CreateCustomDataIdentifierCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateCustomDataIdentifierCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    customDataIdentifierId: 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.customDataIdentifierId !== undefined && data.customDataIdentifierId !== null) {
+                if (data.customDataIdentifierId != null) {
                     contents.customDataIdentifierId = __expectString(data.customDataIdentifierId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateCustomDataIdentifierCommandError = 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) {
@@ -1960,14 +1830,14 @@ var deserializeAws_restJson1CreateCustomDataIdentifierCommandError = function (o
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1979,28 +1849,26 @@ export var deserializeAws_restJson1CreateFindingsFilterCommand = function (outpu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateFindingsFilterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    arn: undefined,
-                    id: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateFindingsFilterCommandError = 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) {
@@ -2045,14 +1913,14 @@ var deserializeAws_restJson1CreateFindingsFilterCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2064,24 +1932,23 @@ export var deserializeAws_restJson1CreateInvitationsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateInvitationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    unprocessedAccounts: 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.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+                if (data.unprocessedAccounts != null) {
                     contents.unprocessedAccounts = deserializeAws_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateInvitationsCommandError = 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) {
@@ -2126,14 +1993,14 @@ var deserializeAws_restJson1CreateInvitationsCommandError = function (output, co
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2145,24 +2012,23 @@ export var deserializeAws_restJson1CreateMemberCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateMemberCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    arn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateMemberCommandError = 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) {
@@ -2207,14 +2073,14 @@ var deserializeAws_restJson1CreateMemberCommandError = function (output, context
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2226,18 +2092,18 @@ export var deserializeAws_restJson1CreateSampleFindingsCommand = function (outpu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateSampleFindingsCommandError(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_restJson1CreateSampleFindingsCommandError = 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) {
@@ -2282,14 +2148,14 @@ var deserializeAws_restJson1CreateSampleFindingsCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2301,24 +2167,23 @@ export var deserializeAws_restJson1DeclineInvitationsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeclineInvitationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    unprocessedAccounts: 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.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+                if (data.unprocessedAccounts != null) {
                     contents.unprocessedAccounts = deserializeAws_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeclineInvitationsCommandError = 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) {
@@ -2363,14 +2228,14 @@ var deserializeAws_restJson1DeclineInvitationsCommandError = function (output, c
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2382,18 +2247,18 @@ export var deserializeAws_restJson1DeleteCustomDataIdentifierCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteCustomDataIdentifierCommandError(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_restJson1DeleteCustomDataIdentifierCommandError = 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) {
@@ -2438,14 +2303,14 @@ var deserializeAws_restJson1DeleteCustomDataIdentifierCommandError = function (o
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2457,18 +2322,18 @@ export var deserializeAws_restJson1DeleteFindingsFilterCommand = function (outpu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteFindingsFilterCommandError(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_restJson1DeleteFindingsFilterCommandError = 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) {
@@ -2513,14 +2378,14 @@ var deserializeAws_restJson1DeleteFindingsFilterCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2532,24 +2397,23 @@ export var deserializeAws_restJson1DeleteInvitationsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteInvitationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    unprocessedAccounts: 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.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+                if (data.unprocessedAccounts != null) {
                     contents.unprocessedAccounts = deserializeAws_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteInvitationsCommandError = 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 +2458,14 @@ var deserializeAws_restJson1DeleteInvitationsCommandError = function (output, co
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2613,18 +2477,18 @@ export var deserializeAws_restJson1DeleteMemberCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteMemberCommandError(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_restJson1DeleteMemberCommandError = 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) {
@@ -2669,14 +2533,14 @@ var deserializeAws_restJson1DeleteMemberCommandError = function (output, context
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2688,28 +2552,26 @@ export var deserializeAws_restJson1DescribeBucketsCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeBucketsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    buckets: 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.buckets !== undefined && data.buckets !== null) {
+                if (data.buckets != null) {
                     contents.buckets = deserializeAws_restJson1__listOfBucketMetadata(data.buckets, 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_restJson1DescribeBucketsCommandError = 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) {
@@ -2754,14 +2616,14 @@ var deserializeAws_restJson1DescribeBucketsCommandError = function (output, cont
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2773,100 +2635,80 @@ export var deserializeAws_restJson1DescribeClassificationJobCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeClassificationJobCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    clientToken: undefined,
-                    createdAt: undefined,
-                    customDataIdentifierIds: undefined,
-                    description: undefined,
-                    initialRun: undefined,
-                    jobArn: undefined,
-                    jobId: undefined,
-                    jobStatus: undefined,
-                    jobType: undefined,
-                    lastRunErrorStatus: undefined,
-                    lastRunTime: undefined,
-                    managedDataIdentifierIds: undefined,
-                    managedDataIdentifierSelector: undefined,
-                    name: undefined,
-                    s3JobDefinition: undefined,
-                    samplingPercentage: undefined,
-                    scheduleFrequency: undefined,
-                    statistics: undefined,
-                    tags: undefined,
-                    userPausedDetails: 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.clientToken !== undefined && data.clientToken !== null) {
+                if (data.clientToken != null) {
                     contents.clientToken = __expectString(data.clientToken);
                 }
-                if (data.createdAt !== undefined && data.createdAt !== null) {
+                if (data.createdAt != null) {
                     contents.createdAt = __expectNonNull(__parseRfc3339DateTime(data.createdAt));
                 }
-                if (data.customDataIdentifierIds !== undefined && data.customDataIdentifierIds !== null) {
+                if (data.customDataIdentifierIds != null) {
                     contents.customDataIdentifierIds = deserializeAws_restJson1__listOf__string(data.customDataIdentifierIds, context);
                 }
-                if (data.description !== undefined && data.description !== null) {
+                if (data.description != null) {
                     contents.description = __expectString(data.description);
                 }
-                if (data.initialRun !== undefined && data.initialRun !== null) {
+                if (data.initialRun != null) {
                     contents.initialRun = __expectBoolean(data.initialRun);
                 }
-                if (data.jobArn !== undefined && data.jobArn !== null) {
+                if (data.jobArn != null) {
                     contents.jobArn = __expectString(data.jobArn);
                 }
-                if (data.jobId !== undefined && data.jobId !== null) {
+                if (data.jobId != null) {
                     contents.jobId = __expectString(data.jobId);
                 }
-                if (data.jobStatus !== undefined && data.jobStatus !== null) {
+                if (data.jobStatus != null) {
                     contents.jobStatus = __expectString(data.jobStatus);
                 }
-                if (data.jobType !== undefined && data.jobType !== null) {
+                if (data.jobType != null) {
                     contents.jobType = __expectString(data.jobType);
                 }
-                if (data.lastRunErrorStatus !== undefined && data.lastRunErrorStatus !== null) {
+                if (data.lastRunErrorStatus != null) {
                     contents.lastRunErrorStatus = deserializeAws_restJson1LastRunErrorStatus(data.lastRunErrorStatus, context);
                 }
-                if (data.lastRunTime !== undefined && data.lastRunTime !== null) {
+                if (data.lastRunTime != null) {
                     contents.lastRunTime = __expectNonNull(__parseRfc3339DateTime(data.lastRunTime));
                 }
-                if (data.managedDataIdentifierIds !== undefined && data.managedDataIdentifierIds !== null) {
+                if (data.managedDataIdentifierIds != null) {
                     contents.managedDataIdentifierIds = deserializeAws_restJson1__listOf__string(data.managedDataIdentifierIds, context);
                 }
-                if (data.managedDataIdentifierSelector !== undefined && data.managedDataIdentifierSelector !== null) {
+                if (data.managedDataIdentifierSelector != null) {
                     contents.managedDataIdentifierSelector = __expectString(data.managedDataIdentifierSelector);
                 }
-                if (data.name !== undefined && data.name !== null) {
+                if (data.name != null) {
                     contents.name = __expectString(data.name);
                 }
-                if (data.s3JobDefinition !== undefined && data.s3JobDefinition !== null) {
+                if (data.s3JobDefinition != null) {
                     contents.s3JobDefinition = deserializeAws_restJson1S3JobDefinition(data.s3JobDefinition, context);
                 }
-                if (data.samplingPercentage !== undefined && data.samplingPercentage !== null) {
+                if (data.samplingPercentage != null) {
                     contents.samplingPercentage = __expectInt32(data.samplingPercentage);
                 }
-                if (data.scheduleFrequency !== undefined && data.scheduleFrequency !== null) {
+                if (data.scheduleFrequency != null) {
                     contents.scheduleFrequency = deserializeAws_restJson1JobScheduleFrequency(data.scheduleFrequency, context);
                 }
-                if (data.statistics !== undefined && data.statistics !== null) {
+                if (data.statistics != null) {
                     contents.statistics = deserializeAws_restJson1Statistics(data.statistics, context);
                 }
-                if (data.tags !== undefined && data.tags !== null) {
+                if (data.tags != null) {
                     contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
                 }
-                if (data.userPausedDetails !== undefined && data.userPausedDetails !== null) {
+                if (data.userPausedDetails != null) {
                     contents.userPausedDetails = deserializeAws_restJson1UserPausedDetails(data.userPausedDetails, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeClassificationJobCommandError = 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) {
@@ -2911,14 +2753,14 @@ var deserializeAws_restJson1DescribeClassificationJobCommandError = function (ou
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2930,28 +2772,26 @@ export var deserializeAws_restJson1DescribeOrganizationConfigurationCommand = fu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeOrganizationConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    autoEnable: undefined,
-                    maxAccountLimitReached: 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.autoEnable !== undefined && data.autoEnable !== null) {
+                if (data.autoEnable != null) {
                     contents.autoEnable = __expectBoolean(data.autoEnable);
                 }
-                if (data.maxAccountLimitReached !== undefined && data.maxAccountLimitReached !== null) {
+                if (data.maxAccountLimitReached != null) {
                     contents.maxAccountLimitReached = __expectBoolean(data.maxAccountLimitReached);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = 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) {
@@ -2996,14 +2836,14 @@ var deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = func
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3015,18 +2855,18 @@ export var deserializeAws_restJson1DisableMacieCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisableMacieCommandError(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_restJson1DisableMacieCommandError = 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) {
@@ -3071,14 +2911,14 @@ var deserializeAws_restJson1DisableMacieCommandError = function (output, context
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3090,18 +2930,18 @@ export var deserializeAws_restJson1DisableOrganizationAdminAccountCommand = func
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisableOrganizationAdminAccountCommandError(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_restJson1DisableOrganizationAdminAccountCommandError = 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) {
@@ -3146,14 +2986,14 @@ var deserializeAws_restJson1DisableOrganizationAdminAccountCommandError = functi
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3165,18 +3005,18 @@ export var deserializeAws_restJson1DisassociateFromAdministratorAccountCommand =
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateFromAdministratorAccountCommandError(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_restJson1DisassociateFromAdministratorAccountCommandError = 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) {
@@ -3221,14 +3061,14 @@ var deserializeAws_restJson1DisassociateFromAdministratorAccountCommandError = f
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3240,18 +3080,18 @@ export var deserializeAws_restJson1DisassociateFromMasterAccountCommand = functi
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateFromMasterAccountCommandError(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_restJson1DisassociateFromMasterAccountCommandError = 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) {
@@ -3296,14 +3136,14 @@ var deserializeAws_restJson1DisassociateFromMasterAccountCommandError = function
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3315,18 +3155,18 @@ export var deserializeAws_restJson1DisassociateMemberCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateMemberCommandError(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_restJson1DisassociateMemberCommandError = 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) {
@@ -3371,14 +3211,14 @@ var deserializeAws_restJson1DisassociateMemberCommandError = function (output, c
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3390,18 +3230,18 @@ export var deserializeAws_restJson1EnableMacieCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1EnableMacieCommandError(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_restJson1EnableMacieCommandError = 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) {
@@ -3446,14 +3286,14 @@ var deserializeAws_restJson1EnableMacieCommandError = function (output, context)
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3465,18 +3305,18 @@ export var deserializeAws_restJson1EnableOrganizationAdminAccountCommand = funct
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1EnableOrganizationAdminAccountCommandError(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_restJson1EnableOrganizationAdminAccountCommandError = 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) {
@@ -3521,14 +3361,14 @@ var deserializeAws_restJson1EnableOrganizationAdminAccountCommandError = functio
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3540,24 +3380,23 @@ export var deserializeAws_restJson1GetAdministratorAccountCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetAdministratorAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    administrator: 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.administrator !== undefined && data.administrator !== null) {
+                if (data.administrator != null) {
                     contents.administrator = deserializeAws_restJson1Invitation(data.administrator, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetAdministratorAccountCommandError = 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) {
@@ -3602,14 +3441,14 @@ var deserializeAws_restJson1GetAdministratorAccountCommandError = function (outp
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3621,74 +3460,60 @@ export var deserializeAws_restJson1GetBucketStatisticsCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetBucketStatisticsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    bucketCount: undefined,
-                    bucketCountByEffectivePermission: undefined,
-                    bucketCountByEncryptionType: undefined,
-                    bucketCountByObjectEncryptionRequirement: undefined,
-                    bucketCountBySharedAccessType: undefined,
-                    classifiableObjectCount: undefined,
-                    classifiableSizeInBytes: undefined,
-                    lastUpdated: undefined,
-                    objectCount: undefined,
-                    sizeInBytes: undefined,
-                    sizeInBytesCompressed: undefined,
-                    unclassifiableObjectCount: undefined,
-                    unclassifiableObjectSizeInBytes: 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.bucketCount !== undefined && data.bucketCount !== null) {
+                if (data.bucketCount != null) {
                     contents.bucketCount = __expectLong(data.bucketCount);
                 }
-                if (data.bucketCountByEffectivePermission !== undefined && data.bucketCountByEffectivePermission !== null) {
+                if (data.bucketCountByEffectivePermission != null) {
                     contents.bucketCountByEffectivePermission = deserializeAws_restJson1BucketCountByEffectivePermission(data.bucketCountByEffectivePermission, context);
                 }
-                if (data.bucketCountByEncryptionType !== undefined && data.bucketCountByEncryptionType !== null) {
+                if (data.bucketCountByEncryptionType != null) {
                     contents.bucketCountByEncryptionType = deserializeAws_restJson1BucketCountByEncryptionType(data.bucketCountByEncryptionType, context);
                 }
-                if (data.bucketCountByObjectEncryptionRequirement !== undefined &&
-                    data.bucketCountByObjectEncryptionRequirement !== null) {
+                if (data.bucketCountByObjectEncryptionRequirement != null) {
                     contents.bucketCountByObjectEncryptionRequirement =
                         deserializeAws_restJson1BucketCountPolicyAllowsUnencryptedObjectUploads(data.bucketCountByObjectEncryptionRequirement, context);
                 }
-                if (data.bucketCountBySharedAccessType !== undefined && data.bucketCountBySharedAccessType !== null) {
+                if (data.bucketCountBySharedAccessType != null) {
                     contents.bucketCountBySharedAccessType = deserializeAws_restJson1BucketCountBySharedAccessType(data.bucketCountBySharedAccessType, context);
                 }
-                if (data.classifiableObjectCount !== undefined && data.classifiableObjectCount !== null) {
+                if (data.classifiableObjectCount != null) {
                     contents.classifiableObjectCount = __expectLong(data.classifiableObjectCount);
                 }
-                if (data.classifiableSizeInBytes !== undefined && data.classifiableSizeInBytes !== null) {
+                if (data.classifiableSizeInBytes != null) {
                     contents.classifiableSizeInBytes = __expectLong(data.classifiableSizeInBytes);
                 }
-                if (data.lastUpdated !== undefined && data.lastUpdated !== null) {
+                if (data.lastUpdated != null) {
                     contents.lastUpdated = __expectNonNull(__parseRfc3339DateTime(data.lastUpdated));
                 }
-                if (data.objectCount !== undefined && data.objectCount !== null) {
+                if (data.objectCount != null) {
                     contents.objectCount = __expectLong(data.objectCount);
                 }
-                if (data.sizeInBytes !== undefined && data.sizeInBytes !== null) {
+                if (data.sizeInBytes != null) {
                     contents.sizeInBytes = __expectLong(data.sizeInBytes);
                 }
-                if (data.sizeInBytesCompressed !== undefined && data.sizeInBytesCompressed !== null) {
+                if (data.sizeInBytesCompressed != null) {
                     contents.sizeInBytesCompressed = __expectLong(data.sizeInBytesCompressed);
                 }
-                if (data.unclassifiableObjectCount !== undefined && data.unclassifiableObjectCount !== null) {
+                if (data.unclassifiableObjectCount != null) {
                     contents.unclassifiableObjectCount = deserializeAws_restJson1ObjectLevelStatistics(data.unclassifiableObjectCount, context);
                 }
-                if (data.unclassifiableObjectSizeInBytes !== undefined && data.unclassifiableObjectSizeInBytes !== null) {
+                if (data.unclassifiableObjectSizeInBytes != null) {
                     contents.unclassifiableObjectSizeInBytes = deserializeAws_restJson1ObjectLevelStatistics(data.unclassifiableObjectSizeInBytes, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetBucketStatisticsCommandError = 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) {
@@ -3733,14 +3558,14 @@ var deserializeAws_restJson1GetBucketStatisticsCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3752,24 +3577,23 @@ export var deserializeAws_restJson1GetClassificationExportConfigurationCommand =
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetClassificationExportConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    configuration: 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.configuration !== undefined && data.configuration !== null) {
+                if (data.configuration != null) {
                     contents.configuration = deserializeAws_restJson1ClassificationExportConfiguration(data.configuration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetClassificationExportConfigurationCommandError = 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) {
@@ -3814,14 +3638,14 @@ var deserializeAws_restJson1GetClassificationExportConfigurationCommandError = f
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3833,68 +3657,56 @@ export var deserializeAws_restJson1GetCustomDataIdentifierCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetCustomDataIdentifierCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    arn: undefined,
-                    createdAt: undefined,
-                    deleted: undefined,
-                    description: undefined,
-                    id: undefined,
-                    ignoreWords: undefined,
-                    keywords: undefined,
-                    maximumMatchDistance: undefined,
-                    name: undefined,
-                    regex: undefined,
-                    severityLevels: undefined,
-                    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.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                if (data.createdAt !== undefined && data.createdAt !== null) {
+                if (data.createdAt != null) {
                     contents.createdAt = __expectNonNull(__parseRfc3339DateTime(data.createdAt));
                 }
-                if (data.deleted !== undefined && data.deleted !== null) {
+                if (data.deleted != null) {
                     contents.deleted = __expectBoolean(data.deleted);
                 }
-                if (data.description !== undefined && data.description !== null) {
+                if (data.description != null) {
                     contents.description = __expectString(data.description);
                 }
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                if (data.ignoreWords !== undefined && data.ignoreWords !== null) {
+                if (data.ignoreWords != null) {
                     contents.ignoreWords = deserializeAws_restJson1__listOf__string(data.ignoreWords, context);
                 }
-                if (data.keywords !== undefined && data.keywords !== null) {
+                if (data.keywords != null) {
                     contents.keywords = deserializeAws_restJson1__listOf__string(data.keywords, context);
                 }
-                if (data.maximumMatchDistance !== undefined && data.maximumMatchDistance !== null) {
+                if (data.maximumMatchDistance != null) {
                     contents.maximumMatchDistance = __expectInt32(data.maximumMatchDistance);
                 }
-                if (data.name !== undefined && data.name !== null) {
+                if (data.name != null) {
                     contents.name = __expectString(data.name);
                 }
-                if (data.regex !== undefined && data.regex !== null) {
+                if (data.regex != null) {
                     contents.regex = __expectString(data.regex);
                 }
-                if (data.severityLevels !== undefined && data.severityLevels !== null) {
+                if (data.severityLevels != null) {
                     contents.severityLevels = deserializeAws_restJson1SeverityLevelList(data.severityLevels, context);
                 }
-                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_restJson1GetCustomDataIdentifierCommandError = 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) {
@@ -3939,14 +3751,14 @@ var deserializeAws_restJson1GetCustomDataIdentifierCommandError = function (outp
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3958,24 +3770,23 @@ export var deserializeAws_restJson1GetFindingsCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetFindingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    findings: 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.findings !== undefined && data.findings !== null) {
+                if (data.findings != null) {
                     contents.findings = deserializeAws_restJson1__listOfFinding(data.findings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetFindingsCommandError = 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) {
@@ -4020,14 +3831,14 @@ var deserializeAws_restJson1GetFindingsCommandError = function (output, context)
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4039,52 +3850,44 @@ export var deserializeAws_restJson1GetFindingsFilterCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetFindingsFilterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    action: undefined,
-                    arn: undefined,
-                    description: undefined,
-                    findingCriteria: undefined,
-                    id: undefined,
-                    name: undefined,
-                    position: undefined,
-                    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.action !== undefined && data.action !== null) {
+                if (data.action != null) {
                     contents.action = __expectString(data.action);
                 }
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                if (data.description !== undefined && data.description !== null) {
+                if (data.description != null) {
                     contents.description = __expectString(data.description);
                 }
-                if (data.findingCriteria !== undefined && data.findingCriteria !== null) {
+                if (data.findingCriteria != null) {
                     contents.findingCriteria = deserializeAws_restJson1FindingCriteria(data.findingCriteria, context);
                 }
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                if (data.name !== undefined && data.name !== null) {
+                if (data.name != null) {
                     contents.name = __expectString(data.name);
                 }
-                if (data.position !== undefined && data.position !== null) {
+                if (data.position != null) {
                     contents.position = __expectInt32(data.position);
                 }
-                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_restJson1GetFindingsFilterCommandError = 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) {
@@ -4129,14 +3932,14 @@ var deserializeAws_restJson1GetFindingsFilterCommandError = function (output, co
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4148,24 +3951,23 @@ export var deserializeAws_restJson1GetFindingsPublicationConfigurationCommand =
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetFindingsPublicationConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    securityHubConfiguration: 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.securityHubConfiguration !== undefined && data.securityHubConfiguration !== null) {
+                if (data.securityHubConfiguration != null) {
                     contents.securityHubConfiguration = deserializeAws_restJson1SecurityHubConfiguration(data.securityHubConfiguration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetFindingsPublicationConfigurationCommandError = 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) {
@@ -4210,14 +4012,14 @@ var deserializeAws_restJson1GetFindingsPublicationConfigurationCommandError = fu
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4229,24 +4031,23 @@ export var deserializeAws_restJson1GetFindingStatisticsCommand = function (outpu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetFindingStatisticsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    countsByGroup: 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.countsByGroup !== undefined && data.countsByGroup !== null) {
+                if (data.countsByGroup != null) {
                     contents.countsByGroup = deserializeAws_restJson1__listOfGroupCount(data.countsByGroup, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetFindingStatisticsCommandError = 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) {
@@ -4291,14 +4092,14 @@ var deserializeAws_restJson1GetFindingStatisticsCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4310,24 +4111,23 @@ export var deserializeAws_restJson1GetInvitationsCountCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetInvitationsCountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    invitationsCount: 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.invitationsCount !== undefined && data.invitationsCount !== null) {
+                if (data.invitationsCount != null) {
                     contents.invitationsCount = __expectLong(data.invitationsCount);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetInvitationsCountCommandError = 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) {
@@ -4372,14 +4172,14 @@ var deserializeAws_restJson1GetInvitationsCountCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4391,40 +4191,35 @@ export var deserializeAws_restJson1GetMacieSessionCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetMacieSessionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    createdAt: undefined,
-                    findingPublishingFrequency: undefined,
-                    serviceRole: undefined,
-                    status: undefined,
-                    updatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.createdAt !== undefined && data.createdAt !== null) {
+                if (data.createdAt != null) {
                     contents.createdAt = __expectNonNull(__parseRfc3339DateTime(data.createdAt));
                 }
-                if (data.findingPublishingFrequency !== undefined && data.findingPublishingFrequency !== null) {
+                if (data.findingPublishingFrequency != null) {
                     contents.findingPublishingFrequency = __expectString(data.findingPublishingFrequency);
                 }
-                if (data.serviceRole !== undefined && data.serviceRole !== null) {
+                if (data.serviceRole != null) {
                     contents.serviceRole = __expectString(data.serviceRole);
                 }
-                if (data.status !== undefined && data.status !== null) {
+                if (data.status != null) {
                     contents.status = __expectString(data.status);
                 }
-                if (data.updatedAt !== undefined && data.updatedAt !== null) {
+                if (data.updatedAt != null) {
                     contents.updatedAt = __expectNonNull(__parseRfc3339DateTime(data.updatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetMacieSessionCommandError = 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) {
@@ -4469,14 +4264,14 @@ var deserializeAws_restJson1GetMacieSessionCommandError = function (output, cont
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4488,24 +4283,23 @@ export var deserializeAws_restJson1GetMasterAccountCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetMasterAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    master: 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.master !== undefined && data.master !== null) {
+                if (data.master != null) {
                     contents.master = deserializeAws_restJson1Invitation(data.master, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetMasterAccountCommandError = 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) {
@@ -4550,14 +4344,14 @@ var deserializeAws_restJson1GetMasterAccountCommandError = function (output, con
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4569,56 +4363,47 @@ export var deserializeAws_restJson1GetMemberCommand = function (output, context)
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetMemberCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    accountId: undefined,
-                    administratorAccountId: undefined,
-                    arn: undefined,
-                    email: undefined,
-                    invitedAt: undefined,
-                    masterAccountId: undefined,
-                    relationshipStatus: undefined,
-                    tags: undefined,
-                    updatedAt: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.accountId !== undefined && data.accountId !== null) {
+                if (data.accountId != null) {
                     contents.accountId = __expectString(data.accountId);
                 }
-                if (data.administratorAccountId !== undefined && data.administratorAccountId !== null) {
+                if (data.administratorAccountId != null) {
                     contents.administratorAccountId = __expectString(data.administratorAccountId);
                 }
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                if (data.email !== undefined && data.email !== null) {
+                if (data.email != null) {
                     contents.email = __expectString(data.email);
                 }
-                if (data.invitedAt !== undefined && data.invitedAt !== null) {
+                if (data.invitedAt != null) {
                     contents.invitedAt = __expectNonNull(__parseRfc3339DateTime(data.invitedAt));
                 }
-                if (data.masterAccountId !== undefined && data.masterAccountId !== null) {
+                if (data.masterAccountId != null) {
                     contents.masterAccountId = __expectString(data.masterAccountId);
                 }
-                if (data.relationshipStatus !== undefined && data.relationshipStatus !== null) {
+                if (data.relationshipStatus != null) {
                     contents.relationshipStatus = __expectString(data.relationshipStatus);
                 }
-                if (data.tags !== undefined && data.tags !== null) {
+                if (data.tags != null) {
                     contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
                 }
-                if (data.updatedAt !== undefined && data.updatedAt !== null) {
+                if (data.updatedAt != null) {
                     contents.updatedAt = __expectNonNull(__parseRfc3339DateTime(data.updatedAt));
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetMemberCommandError = 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) {
@@ -4663,14 +4448,14 @@ var deserializeAws_restJson1GetMemberCommandError = function (output, context) {
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4682,24 +4467,23 @@ export var deserializeAws_restJson1GetRevealConfigurationCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetRevealConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    configuration: 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.configuration !== undefined && data.configuration !== null) {
+                if (data.configuration != null) {
                     contents.configuration = deserializeAws_restJson1RevealConfiguration(data.configuration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetRevealConfigurationCommandError = 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) {
@@ -4732,14 +4516,14 @@ var deserializeAws_restJson1GetRevealConfigurationCommandError = 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];
         }
     });
 }); };
@@ -4751,32 +4535,29 @@ export var deserializeAws_restJson1GetSensitiveDataOccurrencesCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetSensitiveDataOccurrencesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    error: undefined,
-                    sensitiveDataOccurrences: undefined,
-                    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.error !== undefined && data.error !== null) {
+                if (data.error != null) {
                     contents.error = __expectString(data.error);
                 }
-                if (data.sensitiveDataOccurrences !== undefined && data.sensitiveDataOccurrences !== null) {
+                if (data.sensitiveDataOccurrences != null) {
                     contents.sensitiveDataOccurrences = deserializeAws_restJson1SensitiveDataOccurrences(data.sensitiveDataOccurrences, context);
                 }
-                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_restJson1GetSensitiveDataOccurrencesCommandError = 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) {
@@ -4817,14 +4598,14 @@ var deserializeAws_restJson1GetSensitiveDataOccurrencesCommandError = function (
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -4836,28 +4617,26 @@ export var deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityComman
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    code: undefined,
-                    reasons: 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.code !== undefined && data.code !== null) {
+                if (data.code != null) {
                     contents.code = __expectString(data.code);
                 }
-                if (data.reasons !== undefined && data.reasons !== null) {
+                if (data.reasons != null) {
                     contents.reasons = deserializeAws_restJson1__listOfUnavailabilityReasonCode(data.reasons, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommandError = 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) {
@@ -4890,14 +4669,14 @@ var deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommandError
             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];
         }
     });
 }); };
@@ -4909,32 +4688,29 @@ export var deserializeAws_restJson1GetUsageStatisticsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetUsageStatisticsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    records: undefined,
-                    timeRange: 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.records !== undefined && data.records !== null) {
+                if (data.records != null) {
                     contents.records = deserializeAws_restJson1__listOfUsageRecord(data.records, context);
                 }
-                if (data.timeRange !== undefined && data.timeRange !== null) {
+                if (data.timeRange != null) {
                     contents.timeRange = __expectString(data.timeRange);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetUsageStatisticsCommandError = 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 +4755,14 @@ var deserializeAws_restJson1GetUsageStatisticsCommandError = function (output, c
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -4998,28 +4774,26 @@ export var deserializeAws_restJson1GetUsageTotalsCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetUsageTotalsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    timeRange: undefined,
-                    usageTotals: 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.timeRange !== undefined && data.timeRange !== null) {
+                if (data.timeRange != null) {
                     contents.timeRange = __expectString(data.timeRange);
                 }
-                if (data.usageTotals !== undefined && data.usageTotals !== null) {
+                if (data.usageTotals != null) {
                     contents.usageTotals = deserializeAws_restJson1__listOfUsageTotal(data.usageTotals, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetUsageTotalsCommandError = 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) {
@@ -5064,14 +4838,14 @@ var deserializeAws_restJson1GetUsageTotalsCommandError = function (output, conte
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5083,28 +4857,26 @@ export var deserializeAws_restJson1ListClassificationJobsCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListClassificationJobsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    items: 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.items !== undefined && data.items !== null) {
+                if (data.items != null) {
                     contents.items = deserializeAws_restJson1__listOfJobSummary(data.items, 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_restJson1ListClassificationJobsCommandError = 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) {
@@ -5149,14 +4921,14 @@ var deserializeAws_restJson1ListClassificationJobsCommandError = function (outpu
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5168,28 +4940,26 @@ export var deserializeAws_restJson1ListCustomDataIdentifiersCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListCustomDataIdentifiersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    items: 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.items !== undefined && data.items !== null) {
+                if (data.items != null) {
                     contents.items = deserializeAws_restJson1__listOfCustomDataIdentifierSummary(data.items, 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_restJson1ListCustomDataIdentifiersCommandError = 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) {
@@ -5234,14 +5004,14 @@ var deserializeAws_restJson1ListCustomDataIdentifiersCommandError = function (ou
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5253,28 +5023,26 @@ export var deserializeAws_restJson1ListFindingsCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListFindingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    findingIds: 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.findingIds !== undefined && data.findingIds !== null) {
+                if (data.findingIds != null) {
                     contents.findingIds = deserializeAws_restJson1__listOf__string(data.findingIds, 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_restJson1ListFindingsCommandError = 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) {
@@ -5319,14 +5087,14 @@ var deserializeAws_restJson1ListFindingsCommandError = function (output, context
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5338,28 +5106,26 @@ export var deserializeAws_restJson1ListFindingsFiltersCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListFindingsFiltersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    findingsFilterListItems: 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.findingsFilterListItems !== undefined && data.findingsFilterListItems !== null) {
+                if (data.findingsFilterListItems != null) {
                     contents.findingsFilterListItems = deserializeAws_restJson1__listOfFindingsFilterListItem(data.findingsFilterListItems, 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_restJson1ListFindingsFiltersCommandError = 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) {
@@ -5404,14 +5170,14 @@ var deserializeAws_restJson1ListFindingsFiltersCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5423,28 +5189,26 @@ export var deserializeAws_restJson1ListInvitationsCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListInvitationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    invitations: 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.invitations !== undefined && data.invitations !== null) {
+                if (data.invitations != null) {
                     contents.invitations = deserializeAws_restJson1__listOfInvitation(data.invitations, 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_restJson1ListInvitationsCommandError = 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) {
@@ -5489,14 +5253,14 @@ var deserializeAws_restJson1ListInvitationsCommandError = function (output, cont
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5508,28 +5272,26 @@ export var deserializeAws_restJson1ListManagedDataIdentifiersCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListManagedDataIdentifiersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    items: 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.items !== undefined && data.items !== null) {
+                if (data.items != null) {
                     contents.items = deserializeAws_restJson1__listOfManagedDataIdentifierSummary(data.items, 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_restJson1ListManagedDataIdentifiersCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5540,18 +5302,13 @@ var deserializeAws_restJson1ListManagedDataIdentifiersCommandError = function (o
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-                switch (errorCode) {
-                    default:
-                        parsedBody = parsedOutput.body;
-                        $metadata = deserializeMetadata(output);
-                        statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                        response = new __BaseException({
-                            name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                            $fault: "client",
-                            $metadata: $metadata,
-                        });
-                        throw __decorateServiceException(response, parsedBody);
-                }
+                parsedBody = parsedOutput.body;
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
+                });
                 return [2];
         }
     });
@@ -5564,28 +5321,26 @@ export var deserializeAws_restJson1ListMembersCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListMembersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    members: 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.members !== undefined && data.members !== null) {
+                if (data.members != null) {
                     contents.members = deserializeAws_restJson1__listOfMember(data.members, 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_restJson1ListMembersCommandError = 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) {
@@ -5630,14 +5385,14 @@ var deserializeAws_restJson1ListMembersCommandError = function (output, context)
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5649,28 +5404,26 @@ export var deserializeAws_restJson1ListOrganizationAdminAccountsCommand = functi
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListOrganizationAdminAccountsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    adminAccounts: 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.adminAccounts !== undefined && data.adminAccounts !== null) {
+                if (data.adminAccounts != null) {
                     contents.adminAccounts = deserializeAws_restJson1__listOfAdminAccount(data.adminAccounts, 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_restJson1ListOrganizationAdminAccountsCommandError = 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) {
@@ -5715,14 +5468,14 @@ var deserializeAws_restJson1ListOrganizationAdminAccountsCommandError = function
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5734,24 +5487,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, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -5762,18 +5514,13 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-                switch (errorCode) {
-                    default:
-                        parsedBody = parsedOutput.body;
-                        $metadata = deserializeMetadata(output);
-                        statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                        response = new __BaseException({
-                            name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                            $fault: "client",
-                            $metadata: $metadata,
-                        });
-                        throw __decorateServiceException(response, parsedBody);
-                }
+                parsedBody = parsedOutput.body;
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
+                });
                 return [2];
         }
     });
@@ -5786,24 +5533,23 @@ export var deserializeAws_restJson1PutClassificationExportConfigurationCommand =
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1PutClassificationExportConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    configuration: 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.configuration !== undefined && data.configuration !== null) {
+                if (data.configuration != null) {
                     contents.configuration = deserializeAws_restJson1ClassificationExportConfiguration(data.configuration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1PutClassificationExportConfigurationCommandError = 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) {
@@ -5848,14 +5594,14 @@ var deserializeAws_restJson1PutClassificationExportConfigurationCommandError = f
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5867,18 +5613,18 @@ export var deserializeAws_restJson1PutFindingsPublicationConfigurationCommand =
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1PutFindingsPublicationConfigurationCommandError(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_restJson1PutFindingsPublicationConfigurationCommandError = 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) {
@@ -5923,14 +5669,14 @@ var deserializeAws_restJson1PutFindingsPublicationConfigurationCommandError = fu
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -5942,28 +5688,26 @@ export var deserializeAws_restJson1SearchResourcesCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1SearchResourcesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    matchingResources: 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.matchingResources !== undefined && data.matchingResources !== null) {
+                if (data.matchingResources != null) {
                     contents.matchingResources = deserializeAws_restJson1__listOfMatchingResource(data.matchingResources, 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_restJson1SearchResourcesCommandError = 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) {
@@ -6008,14 +5752,14 @@ var deserializeAws_restJson1SearchResourcesCommandError = function (output, cont
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -6027,18 +5771,18 @@ export var deserializeAws_restJson1TagResourceCommand = function (output, contex
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1TagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1TagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -6049,18 +5793,13 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-                switch (errorCode) {
-                    default:
-                        parsedBody = parsedOutput.body;
-                        $metadata = deserializeMetadata(output);
-                        statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                        response = new __BaseException({
-                            name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                            $fault: "client",
-                            $metadata: $metadata,
-                        });
-                        throw __decorateServiceException(response, parsedBody);
-                }
+                parsedBody = parsedOutput.body;
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
+                });
                 return [2];
         }
     });
@@ -6073,24 +5812,23 @@ export var deserializeAws_restJson1TestCustomDataIdentifierCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1TestCustomDataIdentifierCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    matchCount: 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.matchCount !== undefined && data.matchCount !== null) {
+                if (data.matchCount != null) {
                     contents.matchCount = __expectInt32(data.matchCount);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1TestCustomDataIdentifierCommandError = 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) {
@@ -6135,14 +5873,14 @@ var deserializeAws_restJson1TestCustomDataIdentifierCommandError = function (out
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -6154,18 +5892,18 @@ export var deserializeAws_restJson1UntagResourceCommand = function (output, cont
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UntagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UntagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, parsedBody;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -6176,18 +5914,13 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-                switch (errorCode) {
-                    default:
-                        parsedBody = parsedOutput.body;
-                        $metadata = deserializeMetadata(output);
-                        statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                        response = new __BaseException({
-                            name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                            $fault: "client",
-                            $metadata: $metadata,
-                        });
-                        throw __decorateServiceException(response, parsedBody);
-                }
+                parsedBody = parsedOutput.body;
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
+                });
                 return [2];
         }
     });
@@ -6200,18 +5933,18 @@ export var deserializeAws_restJson1UpdateClassificationJobCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateClassificationJobCommandError(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_restJson1UpdateClassificationJobCommandError = 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) {
@@ -6256,14 +5989,14 @@ var deserializeAws_restJson1UpdateClassificationJobCommandError = function (outp
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -6275,28 +6008,26 @@ export var deserializeAws_restJson1UpdateFindingsFilterCommand = function (outpu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateFindingsFilterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    arn: undefined,
-                    id: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateFindingsFilterCommandError = 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) {
@@ -6341,14 +6072,14 @@ var deserializeAws_restJson1UpdateFindingsFilterCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -6360,18 +6091,18 @@ export var deserializeAws_restJson1UpdateMacieSessionCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateMacieSessionCommandError(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_restJson1UpdateMacieSessionCommandError = 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) {
@@ -6416,14 +6147,14 @@ var deserializeAws_restJson1UpdateMacieSessionCommandError = function (output, c
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -6435,18 +6166,18 @@ export var deserializeAws_restJson1UpdateMemberSessionCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateMemberSessionCommandError(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_restJson1UpdateMemberSessionCommandError = 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) {
@@ -6491,14 +6222,14 @@ var deserializeAws_restJson1UpdateMemberSessionCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -6510,18 +6241,18 @@ export var deserializeAws_restJson1UpdateOrganizationConfigurationCommand = func
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateOrganizationConfigurationCommandError(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_restJson1UpdateOrganizationConfigurationCommandError = 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) {
@@ -6566,14 +6297,14 @@ var deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = functi
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -6585,24 +6316,23 @@ export var deserializeAws_restJson1UpdateRevealConfigurationCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateRevealConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    configuration: 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.configuration !== undefined && data.configuration !== null) {
+                if (data.configuration != null) {
                     contents.configuration = deserializeAws_restJson1RevealConfiguration(data.configuration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateRevealConfigurationCommandError = 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) {
@@ -6635,23 +6365,24 @@ var deserializeAws_restJson1UpdateRevealConfigurationCommandError = 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];
         }
     });
 }); };
+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));
@@ -6661,9 +6392,9 @@ var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutp
 var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -6673,9 +6404,9 @@ var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new InternalServerException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -6685,9 +6416,9 @@ 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);
         }
         exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -6697,9 +6428,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));
@@ -6709,9 +6440,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));
@@ -6721,9 +6452,9 @@ var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput
 var deserializeAws_restJson1UnprocessableEntityExceptionResponse = 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 UnprocessableEntityException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -6733,9 +6464,9 @@ var deserializeAws_restJson1UnprocessableEntityExceptionResponse = function (par
 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.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -6746,9 +6477,6 @@ var serializeAws_restJson1__listOf__string = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -6756,9 +6484,6 @@ var serializeAws_restJson1__listOfCriteriaForJob = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CriteriaForJob(entry, context);
     });
 };
@@ -6766,9 +6491,6 @@ var serializeAws_restJson1__listOfFindingType = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -6776,9 +6498,6 @@ var serializeAws_restJson1__listOfJobScopeTerm = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1JobScopeTerm(entry, context);
     });
 };
@@ -6786,9 +6505,6 @@ var serializeAws_restJson1__listOfListJobsFilterTerm = function (input, context)
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1ListJobsFilterTerm(entry, context);
     });
 };
@@ -6796,9 +6512,6 @@ var serializeAws_restJson1__listOfS3BucketDefinitionForJob = function (input, co
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1S3BucketDefinitionForJob(entry, context);
     });
 };
@@ -6806,9 +6519,6 @@ var serializeAws_restJson1__listOfSearchResourcesCriteria = function (input, con
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1SearchResourcesCriteria(entry, context);
     });
 };
@@ -6816,9 +6526,6 @@ var serializeAws_restJson1__listOfSearchResourcesTagCriterionPair = function (in
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1SearchResourcesTagCriterionPair(entry, context);
     });
 };
@@ -6826,9 +6533,6 @@ var serializeAws_restJson1__listOfTagCriterionPairForJob = function (input, cont
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1TagCriterionPairForJob(entry, context);
     });
 };
@@ -6836,9 +6540,6 @@ var serializeAws_restJson1__listOfTagValuePair = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1TagValuePair(entry, context);
     });
 };
@@ -6846,9 +6547,6 @@ var serializeAws_restJson1__listOfUsageStatisticsFilter = function (input, conte
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1UsageStatisticsFilter(entry, context);
     });
 };
@@ -7010,9 +6708,6 @@ var serializeAws_restJson1SeverityLevelList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1SeverityLevel(entry, context);
     });
 };