@aws-sdk/client-macie2 3.131.0 → 3.142.0

package/dist-cjs/protocols/Aws_restJson1.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeAws_restJson1TagResourceCommand = exports.serializeAws_restJson1SearchResourcesCommand = exports.serializeAws_restJson1PutFindingsPublicationConfigurationCommand = exports.serializeAws_restJson1PutClassificationExportConfigurationCommand = exports.serializeAws_restJson1ListTagsForResourceCommand = exports.serializeAws_restJson1ListOrganizationAdminAccountsCommand = exports.serializeAws_restJson1ListMembersCommand = exports.serializeAws_restJson1ListManagedDataIdentifiersCommand = exports.serializeAws_restJson1ListInvitationsCommand = exports.serializeAws_restJson1ListFindingsFiltersCommand = exports.serializeAws_restJson1ListFindingsCommand = exports.serializeAws_restJson1ListCustomDataIdentifiersCommand = exports.serializeAws_restJson1ListClassificationJobsCommand = exports.serializeAws_restJson1GetUsageTotalsCommand = exports.serializeAws_restJson1GetUsageStatisticsCommand = exports.serializeAws_restJson1GetMemberCommand = exports.serializeAws_restJson1GetMasterAccountCommand = exports.serializeAws_restJson1GetMacieSessionCommand = exports.serializeAws_restJson1GetInvitationsCountCommand = exports.serializeAws_restJson1GetFindingStatisticsCommand = exports.serializeAws_restJson1GetFindingsPublicationConfigurationCommand = exports.serializeAws_restJson1GetFindingsFilterCommand = exports.serializeAws_restJson1GetFindingsCommand = exports.serializeAws_restJson1GetCustomDataIdentifierCommand = exports.serializeAws_restJson1GetClassificationExportConfigurationCommand = exports.serializeAws_restJson1GetBucketStatisticsCommand = exports.serializeAws_restJson1GetAdministratorAccountCommand = exports.serializeAws_restJson1EnableOrganizationAdminAccountCommand = exports.serializeAws_restJson1EnableMacieCommand = exports.serializeAws_restJson1DisassociateMemberCommand = exports.serializeAws_restJson1DisassociateFromMasterAccountCommand = exports.serializeAws_restJson1DisassociateFromAdministratorAccountCommand = exports.serializeAws_restJson1DisableOrganizationAdminAccountCommand = exports.serializeAws_restJson1DisableMacieCommand = exports.serializeAws_restJson1DescribeOrganizationConfigurationCommand = exports.serializeAws_restJson1DescribeClassificationJobCommand = exports.serializeAws_restJson1DescribeBucketsCommand = exports.serializeAws_restJson1DeleteMemberCommand = exports.serializeAws_restJson1DeleteInvitationsCommand = exports.serializeAws_restJson1DeleteFindingsFilterCommand = exports.serializeAws_restJson1DeleteCustomDataIdentifierCommand = exports.serializeAws_restJson1DeclineInvitationsCommand = exports.serializeAws_restJson1CreateSampleFindingsCommand = exports.serializeAws_restJson1CreateMemberCommand = exports.serializeAws_restJson1CreateInvitationsCommand = exports.serializeAws_restJson1CreateFindingsFilterCommand = exports.serializeAws_restJson1CreateCustomDataIdentifierCommand = exports.serializeAws_restJson1CreateClassificationJobCommand = exports.serializeAws_restJson1BatchGetCustomDataIdentifiersCommand = exports.serializeAws_restJson1AcceptInvitationCommand = void 0;
-exports.deserializeAws_restJson1ListManagedDataIdentifiersCommand = exports.deserializeAws_restJson1ListInvitationsCommand = exports.deserializeAws_restJson1ListFindingsFiltersCommand = exports.deserializeAws_restJson1ListFindingsCommand = exports.deserializeAws_restJson1ListCustomDataIdentifiersCommand = exports.deserializeAws_restJson1ListClassificationJobsCommand = exports.deserializeAws_restJson1GetUsageTotalsCommand = exports.deserializeAws_restJson1GetUsageStatisticsCommand = exports.deserializeAws_restJson1GetMemberCommand = exports.deserializeAws_restJson1GetMasterAccountCommand = exports.deserializeAws_restJson1GetMacieSessionCommand = exports.deserializeAws_restJson1GetInvitationsCountCommand = exports.deserializeAws_restJson1GetFindingStatisticsCommand = exports.deserializeAws_restJson1GetFindingsPublicationConfigurationCommand = exports.deserializeAws_restJson1GetFindingsFilterCommand = exports.deserializeAws_restJson1GetFindingsCommand = exports.deserializeAws_restJson1GetCustomDataIdentifierCommand = exports.deserializeAws_restJson1GetClassificationExportConfigurationCommand = exports.deserializeAws_restJson1GetBucketStatisticsCommand = exports.deserializeAws_restJson1GetAdministratorAccountCommand = exports.deserializeAws_restJson1EnableOrganizationAdminAccountCommand = exports.deserializeAws_restJson1EnableMacieCommand = exports.deserializeAws_restJson1DisassociateMemberCommand = exports.deserializeAws_restJson1DisassociateFromMasterAccountCommand = exports.deserializeAws_restJson1DisassociateFromAdministratorAccountCommand = exports.deserializeAws_restJson1DisableOrganizationAdminAccountCommand = exports.deserializeAws_restJson1DisableMacieCommand = exports.deserializeAws_restJson1DescribeOrganizationConfigurationCommand = exports.deserializeAws_restJson1DescribeClassificationJobCommand = exports.deserializeAws_restJson1DescribeBucketsCommand = exports.deserializeAws_restJson1DeleteMemberCommand = exports.deserializeAws_restJson1DeleteInvitationsCommand = exports.deserializeAws_restJson1DeleteFindingsFilterCommand = exports.deserializeAws_restJson1DeleteCustomDataIdentifierCommand = exports.deserializeAws_restJson1DeclineInvitationsCommand = exports.deserializeAws_restJson1CreateSampleFindingsCommand = exports.deserializeAws_restJson1CreateMemberCommand = exports.deserializeAws_restJson1CreateInvitationsCommand = exports.deserializeAws_restJson1CreateFindingsFilterCommand = exports.deserializeAws_restJson1CreateCustomDataIdentifierCommand = exports.deserializeAws_restJson1CreateClassificationJobCommand = exports.deserializeAws_restJson1BatchGetCustomDataIdentifiersCommand = exports.deserializeAws_restJson1AcceptInvitationCommand = exports.serializeAws_restJson1UpdateOrganizationConfigurationCommand = exports.serializeAws_restJson1UpdateMemberSessionCommand = exports.serializeAws_restJson1UpdateMacieSessionCommand = exports.serializeAws_restJson1UpdateFindingsFilterCommand = exports.serializeAws_restJson1UpdateClassificationJobCommand = exports.serializeAws_restJson1UntagResourceCommand = exports.serializeAws_restJson1TestCustomDataIdentifierCommand = void 0;
-exports.deserializeAws_restJson1UpdateOrganizationConfigurationCommand = exports.deserializeAws_restJson1UpdateMemberSessionCommand = exports.deserializeAws_restJson1UpdateMacieSessionCommand = exports.deserializeAws_restJson1UpdateFindingsFilterCommand = exports.deserializeAws_restJson1UpdateClassificationJobCommand = exports.deserializeAws_restJson1UntagResourceCommand = exports.deserializeAws_restJson1TestCustomDataIdentifierCommand = exports.deserializeAws_restJson1TagResourceCommand = exports.deserializeAws_restJson1SearchResourcesCommand = exports.deserializeAws_restJson1PutFindingsPublicationConfigurationCommand = exports.deserializeAws_restJson1PutClassificationExportConfigurationCommand = exports.deserializeAws_restJson1ListTagsForResourceCommand = exports.deserializeAws_restJson1ListOrganizationAdminAccountsCommand = exports.deserializeAws_restJson1ListMembersCommand = void 0;
+exports.serializeAws_restJson1PutClassificationExportConfigurationCommand = exports.serializeAws_restJson1ListTagsForResourceCommand = exports.serializeAws_restJson1ListOrganizationAdminAccountsCommand = exports.serializeAws_restJson1ListMembersCommand = exports.serializeAws_restJson1ListManagedDataIdentifiersCommand = exports.serializeAws_restJson1ListInvitationsCommand = exports.serializeAws_restJson1ListFindingsFiltersCommand = exports.serializeAws_restJson1ListFindingsCommand = exports.serializeAws_restJson1ListCustomDataIdentifiersCommand = exports.serializeAws_restJson1ListClassificationJobsCommand = exports.serializeAws_restJson1GetUsageTotalsCommand = exports.serializeAws_restJson1GetUsageStatisticsCommand = exports.serializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand = exports.serializeAws_restJson1GetSensitiveDataOccurrencesCommand = exports.serializeAws_restJson1GetRevealConfigurationCommand = exports.serializeAws_restJson1GetMemberCommand = exports.serializeAws_restJson1GetMasterAccountCommand = exports.serializeAws_restJson1GetMacieSessionCommand = exports.serializeAws_restJson1GetInvitationsCountCommand = exports.serializeAws_restJson1GetFindingStatisticsCommand = exports.serializeAws_restJson1GetFindingsPublicationConfigurationCommand = exports.serializeAws_restJson1GetFindingsFilterCommand = exports.serializeAws_restJson1GetFindingsCommand = exports.serializeAws_restJson1GetCustomDataIdentifierCommand = exports.serializeAws_restJson1GetClassificationExportConfigurationCommand = exports.serializeAws_restJson1GetBucketStatisticsCommand = exports.serializeAws_restJson1GetAdministratorAccountCommand = exports.serializeAws_restJson1EnableOrganizationAdminAccountCommand = exports.serializeAws_restJson1EnableMacieCommand = exports.serializeAws_restJson1DisassociateMemberCommand = exports.serializeAws_restJson1DisassociateFromMasterAccountCommand = exports.serializeAws_restJson1DisassociateFromAdministratorAccountCommand = exports.serializeAws_restJson1DisableOrganizationAdminAccountCommand = exports.serializeAws_restJson1DisableMacieCommand = exports.serializeAws_restJson1DescribeOrganizationConfigurationCommand = exports.serializeAws_restJson1DescribeClassificationJobCommand = exports.serializeAws_restJson1DescribeBucketsCommand = exports.serializeAws_restJson1DeleteMemberCommand = exports.serializeAws_restJson1DeleteInvitationsCommand = exports.serializeAws_restJson1DeleteFindingsFilterCommand = exports.serializeAws_restJson1DeleteCustomDataIdentifierCommand = exports.serializeAws_restJson1DeclineInvitationsCommand = exports.serializeAws_restJson1CreateSampleFindingsCommand = exports.serializeAws_restJson1CreateMemberCommand = exports.serializeAws_restJson1CreateInvitationsCommand = exports.serializeAws_restJson1CreateFindingsFilterCommand = exports.serializeAws_restJson1CreateCustomDataIdentifierCommand = exports.serializeAws_restJson1CreateClassificationJobCommand = exports.serializeAws_restJson1BatchGetCustomDataIdentifiersCommand = exports.serializeAws_restJson1AcceptInvitationCommand = void 0;
+exports.deserializeAws_restJson1GetUsageStatisticsCommand = exports.deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand = exports.deserializeAws_restJson1GetSensitiveDataOccurrencesCommand = exports.deserializeAws_restJson1GetRevealConfigurationCommand = exports.deserializeAws_restJson1GetMemberCommand = exports.deserializeAws_restJson1GetMasterAccountCommand = exports.deserializeAws_restJson1GetMacieSessionCommand = exports.deserializeAws_restJson1GetInvitationsCountCommand = exports.deserializeAws_restJson1GetFindingStatisticsCommand = exports.deserializeAws_restJson1GetFindingsPublicationConfigurationCommand = exports.deserializeAws_restJson1GetFindingsFilterCommand = exports.deserializeAws_restJson1GetFindingsCommand = exports.deserializeAws_restJson1GetCustomDataIdentifierCommand = exports.deserializeAws_restJson1GetClassificationExportConfigurationCommand = exports.deserializeAws_restJson1GetBucketStatisticsCommand = exports.deserializeAws_restJson1GetAdministratorAccountCommand = exports.deserializeAws_restJson1EnableOrganizationAdminAccountCommand = exports.deserializeAws_restJson1EnableMacieCommand = exports.deserializeAws_restJson1DisassociateMemberCommand = exports.deserializeAws_restJson1DisassociateFromMasterAccountCommand = exports.deserializeAws_restJson1DisassociateFromAdministratorAccountCommand = exports.deserializeAws_restJson1DisableOrganizationAdminAccountCommand = exports.deserializeAws_restJson1DisableMacieCommand = exports.deserializeAws_restJson1DescribeOrganizationConfigurationCommand = exports.deserializeAws_restJson1DescribeClassificationJobCommand = exports.deserializeAws_restJson1DescribeBucketsCommand = exports.deserializeAws_restJson1DeleteMemberCommand = exports.deserializeAws_restJson1DeleteInvitationsCommand = exports.deserializeAws_restJson1DeleteFindingsFilterCommand = exports.deserializeAws_restJson1DeleteCustomDataIdentifierCommand = exports.deserializeAws_restJson1DeclineInvitationsCommand = exports.deserializeAws_restJson1CreateSampleFindingsCommand = exports.deserializeAws_restJson1CreateMemberCommand = exports.deserializeAws_restJson1CreateInvitationsCommand = exports.deserializeAws_restJson1CreateFindingsFilterCommand = exports.deserializeAws_restJson1CreateCustomDataIdentifierCommand = exports.deserializeAws_restJson1CreateClassificationJobCommand = exports.deserializeAws_restJson1BatchGetCustomDataIdentifiersCommand = exports.deserializeAws_restJson1AcceptInvitationCommand = exports.serializeAws_restJson1UpdateRevealConfigurationCommand = exports.serializeAws_restJson1UpdateOrganizationConfigurationCommand = exports.serializeAws_restJson1UpdateMemberSessionCommand = exports.serializeAws_restJson1UpdateMacieSessionCommand = exports.serializeAws_restJson1UpdateFindingsFilterCommand = exports.serializeAws_restJson1UpdateClassificationJobCommand = exports.serializeAws_restJson1UntagResourceCommand = exports.serializeAws_restJson1TestCustomDataIdentifierCommand = exports.serializeAws_restJson1TagResourceCommand = exports.serializeAws_restJson1SearchResourcesCommand = exports.serializeAws_restJson1PutFindingsPublicationConfigurationCommand = void 0;
+exports.deserializeAws_restJson1UpdateRevealConfigurationCommand = exports.deserializeAws_restJson1UpdateOrganizationConfigurationCommand = exports.deserializeAws_restJson1UpdateMemberSessionCommand = exports.deserializeAws_restJson1UpdateMacieSessionCommand = exports.deserializeAws_restJson1UpdateFindingsFilterCommand = exports.deserializeAws_restJson1UpdateClassificationJobCommand = exports.deserializeAws_restJson1UntagResourceCommand = exports.deserializeAws_restJson1TestCustomDataIdentifierCommand = exports.deserializeAws_restJson1TagResourceCommand = exports.deserializeAws_restJson1SearchResourcesCommand = exports.deserializeAws_restJson1PutFindingsPublicationConfigurationCommand = exports.deserializeAws_restJson1PutClassificationExportConfigurationCommand = exports.deserializeAws_restJson1ListTagsForResourceCommand = exports.deserializeAws_restJson1ListOrganizationAdminAccountsCommand = exports.deserializeAws_restJson1ListMembersCommand = exports.deserializeAws_restJson1ListManagedDataIdentifiersCommand = exports.deserializeAws_restJson1ListInvitationsCommand = exports.deserializeAws_restJson1ListFindingsFiltersCommand = exports.deserializeAws_restJson1ListFindingsCommand = exports.deserializeAws_restJson1ListCustomDataIdentifiersCommand = exports.deserializeAws_restJson1ListClassificationJobsCommand = exports.deserializeAws_restJson1GetUsageTotalsCommand = void 0;
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
 const uuid_1 = require("uuid");
@@ -252,16 +252,7 @@ const serializeAws_restJson1DeleteCustomDataIdentifierCommand = async (input, co
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/custom-data-identifiers/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -278,16 +269,7 @@ const serializeAws_restJson1DeleteFindingsFilterCommand = async (input, context)
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/findingsfilters/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -325,16 +307,7 @@ const serializeAws_restJson1DeleteMemberCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/members/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -377,16 +350,7 @@ const serializeAws_restJson1DescribeClassificationJobCommand = async (input, con
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/jobs/{jobId}";
-    if (input.jobId !== undefined) {
-        const labelValue = input.jobId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: jobId.");
-        }
-        resolvedPath = resolvedPath.replace("{jobId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: jobId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "jobId", () => input.jobId, "{jobId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -441,9 +405,9 @@ const serializeAws_restJson1DisableOrganizationAdminAccountCommand = async (inpu
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/admin";
-    const query = {
-        ...(input.adminAccountId !== undefined && { adminAccountId: input.adminAccountId }),
-    };
+    const query = map({
+        adminAccountId: [, input.adminAccountId],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -499,16 +463,7 @@ const serializeAws_restJson1DisassociateMemberCommand = async (input, context) =
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/members/disassociate/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -631,16 +586,7 @@ const serializeAws_restJson1GetCustomDataIdentifierCommand = async (input, conte
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/custom-data-identifiers/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -681,16 +627,7 @@ const serializeAws_restJson1GetFindingsFilterCommand = async (input, context) =>
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/findingsfilters/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -811,16 +748,7 @@ const serializeAws_restJson1GetMemberCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/members/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -833,6 +761,59 @@ const serializeAws_restJson1GetMemberCommand = async (input, context) => {
     });
 };
 exports.serializeAws_restJson1GetMemberCommand = serializeAws_restJson1GetMemberCommand;
+const serializeAws_restJson1GetRevealConfigurationCommand = async (input, context) => {
+    const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
+    const headers = {
+        "content-type": "application/json",
+    };
+    const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/reveal-configuration";
+    let body;
+    body = "";
+    return new protocol_http_1.HttpRequest({
+        protocol,
+        hostname,
+        port,
+        method: "GET",
+        headers,
+        path: resolvedPath,
+        body,
+    });
+};
+exports.serializeAws_restJson1GetRevealConfigurationCommand = serializeAws_restJson1GetRevealConfigurationCommand;
+const serializeAws_restJson1GetSensitiveDataOccurrencesCommand = async (input, context) => {
+    const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
+    const headers = {};
+    let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/findings/{findingId}/reveal";
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "findingId", () => input.findingId, "{findingId}", false);
+    let body;
+    return new protocol_http_1.HttpRequest({
+        protocol,
+        hostname,
+        port,
+        method: "GET",
+        headers,
+        path: resolvedPath,
+        body,
+    });
+};
+exports.serializeAws_restJson1GetSensitiveDataOccurrencesCommand = serializeAws_restJson1GetSensitiveDataOccurrencesCommand;
+const serializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand = async (input, context) => {
+    const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
+    const headers = {};
+    let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/findings/{findingId}/reveal/availability";
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "findingId", () => input.findingId, "{findingId}", false);
+    let body;
+    return new protocol_http_1.HttpRequest({
+        protocol,
+        hostname,
+        port,
+        method: "GET",
+        headers,
+        path: resolvedPath,
+        body,
+    });
+};
+exports.serializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand = serializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand;
 const serializeAws_restJson1GetUsageStatisticsCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {
@@ -864,9 +845,9 @@ const serializeAws_restJson1GetUsageTotalsCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/usage";
-    const query = {
-        ...(input.timeRange !== undefined && { timeRange: input.timeRange }),
-    };
+    const query = map({
+        timeRange: [, input.timeRange],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -962,10 +943,10 @@ const serializeAws_restJson1ListFindingsFiltersCommand = async (input, context)
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/findingsfilters";
-    const query = {
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-    };
+    const query = map({
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        nextToken: [, input.nextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -983,10 +964,10 @@ const serializeAws_restJson1ListInvitationsCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/invitations";
-    const query = {
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-    };
+    const query = map({
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        nextToken: [, input.nextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1025,11 +1006,11 @@ const serializeAws_restJson1ListMembersCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/members";
-    const query = {
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.onlyAssociated !== undefined && { onlyAssociated: input.onlyAssociated }),
-    };
+    const query = map({
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        nextToken: [, input.nextToken],
+        onlyAssociated: [, input.onlyAssociated],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1047,10 +1028,10 @@ const serializeAws_restJson1ListOrganizationAdminAccountsCommand = async (input,
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/admin";
-    const query = {
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-    };
+    const query = map({
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        nextToken: [, input.nextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1068,16 +1049,7 @@ const serializeAws_restJson1ListTagsForResourceCommand = async (input, context)
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{resourceArn}";
-    if (input.resourceArn !== undefined) {
-        const labelValue = input.resourceArn;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: resourceArn.");
-        }
-        resolvedPath = resolvedPath.replace("{resourceArn}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: resourceArn.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "resourceArn", () => input.resourceArn, "{resourceArn}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1172,16 +1144,7 @@ const serializeAws_restJson1TagResourceCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{resourceArn}";
-    if (input.resourceArn !== undefined) {
-        const labelValue = input.resourceArn;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: resourceArn.");
-        }
-        resolvedPath = resolvedPath.replace("{resourceArn}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: resourceArn.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "resourceArn", () => input.resourceArn, "{resourceArn}", false);
     let body;
     body = JSON.stringify({
         ...(input.tags != null && { tags: serializeAws_restJson1TagMap(input.tags, context) }),
@@ -1228,19 +1191,10 @@ const serializeAws_restJson1UntagResourceCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{resourceArn}";
-    if (input.resourceArn !== undefined) {
-        const labelValue = input.resourceArn;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: resourceArn.");
-        }
-        resolvedPath = resolvedPath.replace("{resourceArn}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: resourceArn.");
-    }
-    const query = {
-        ...(input.tagKeys !== undefined && { tagKeys: (input.tagKeys || []).map((_entry) => _entry) }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "resourceArn", () => input.resourceArn, "{resourceArn}", false);
+    const query = map({
+        tagKeys: [() => input.tagKeys !== void 0, () => (input.tagKeys || []).map((_entry) => _entry)],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1260,16 +1214,7 @@ const serializeAws_restJson1UpdateClassificationJobCommand = async (input, conte
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/jobs/{jobId}";
-    if (input.jobId !== undefined) {
-        const labelValue = input.jobId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: jobId.");
-        }
-        resolvedPath = resolvedPath.replace("{jobId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: jobId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "jobId", () => input.jobId, "{jobId}", false);
     let body;
     body = JSON.stringify({
         ...(input.jobStatus != null && { jobStatus: input.jobStatus }),
@@ -1292,16 +1237,7 @@ const serializeAws_restJson1UpdateFindingsFilterCommand = async (input, context)
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/findingsfilters/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     body = JSON.stringify({
         ...(input.action != null && { action: input.action }),
@@ -1352,16 +1288,7 @@ const serializeAws_restJson1UpdateMemberSessionCommand = async (input, context)
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/macie/members/{id}";
-    if (input.id !== undefined) {
-        const labelValue = input.id;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: id.");
-        }
-        resolvedPath = resolvedPath.replace("{id}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: id.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "id", () => input.id, "{id}", false);
     let body;
     body = JSON.stringify({
         ...(input.status != null && { status: input.status }),
@@ -1398,15 +1325,38 @@ const serializeAws_restJson1UpdateOrganizationConfigurationCommand = async (inpu
     });
 };
 exports.serializeAws_restJson1UpdateOrganizationConfigurationCommand = serializeAws_restJson1UpdateOrganizationConfigurationCommand;
+const serializeAws_restJson1UpdateRevealConfigurationCommand = async (input, context) => {
+    const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
+    const headers = {
+        "content-type": "application/json",
+    };
+    const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/reveal-configuration";
+    let body;
+    body = JSON.stringify({
+        ...(input.configuration != null && {
+            configuration: serializeAws_restJson1RevealConfiguration(input.configuration, context),
+        }),
+    });
+    return new protocol_http_1.HttpRequest({
+        protocol,
+        hostname,
+        port,
+        method: "PUT",
+        headers,
+        path: resolvedPath,
+        body,
+    });
+};
+exports.serializeAws_restJson1UpdateRevealConfigurationCommand = serializeAws_restJson1UpdateRevealConfigurationCommand;
 const deserializeAws_restJson1AcceptInvitationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1AcceptInvitationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1AcceptInvitationCommand = deserializeAws_restJson1AcceptInvitationCommand;
 const deserializeAws_restJson1AcceptInvitationCommandError = async (output, context) => {
@@ -1414,7 +1364,6 @@ const deserializeAws_restJson1AcceptInvitationCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1440,33 +1389,29 @@ const deserializeAws_restJson1AcceptInvitationCommandError = async (output, cont
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1BatchGetCustomDataIdentifiersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1BatchGetCustomDataIdentifiersCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        customDataIdentifiers: undefined,
-        notFoundIdentifierIds: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1BatchGetCustomDataIdentifiersCommand = deserializeAws_restJson1BatchGetCustomDataIdentifiersCommand;
 const deserializeAws_restJson1BatchGetCustomDataIdentifiersCommandError = async (output, context) => {
@@ -1474,7 +1419,6 @@ const deserializeAws_restJson1BatchGetCustomDataIdentifiersCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1500,33 +1444,29 @@ const deserializeAws_restJson1BatchGetCustomDataIdentifiersCommandError = async
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateClassificationJobCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateClassificationJobCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        jobArn: undefined,
-        jobId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.jobArn !== undefined && data.jobArn !== null) {
+    if (data.jobArn != null) {
         contents.jobArn = (0, smithy_client_1.expectString)(data.jobArn);
     }
-    if (data.jobId !== undefined && data.jobId !== null) {
+    if (data.jobId != null) {
         contents.jobId = (0, smithy_client_1.expectString)(data.jobId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateClassificationJobCommand = deserializeAws_restJson1CreateClassificationJobCommand;
 const deserializeAws_restJson1CreateClassificationJobCommandError = async (output, context) => {
@@ -1534,7 +1474,6 @@ const deserializeAws_restJson1CreateClassificationJobCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1560,29 +1499,26 @@ const deserializeAws_restJson1CreateClassificationJobCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateCustomDataIdentifierCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateCustomDataIdentifierCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        customDataIdentifierId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.customDataIdentifierId !== undefined && data.customDataIdentifierId !== null) {
+    if (data.customDataIdentifierId != null) {
         contents.customDataIdentifierId = (0, smithy_client_1.expectString)(data.customDataIdentifierId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateCustomDataIdentifierCommand = deserializeAws_restJson1CreateCustomDataIdentifierCommand;
 const deserializeAws_restJson1CreateCustomDataIdentifierCommandError = async (output, context) => {
@@ -1590,7 +1526,6 @@ const deserializeAws_restJson1CreateCustomDataIdentifierCommandError = async (ou
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1616,33 +1551,29 @@ const deserializeAws_restJson1CreateCustomDataIdentifierCommandError = async (ou
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateFindingsFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateFindingsFilterCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        arn: undefined,
-        id: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    if (data.id !== undefined && data.id !== null) {
+    if (data.id != null) {
         contents.id = (0, smithy_client_1.expectString)(data.id);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateFindingsFilterCommand = deserializeAws_restJson1CreateFindingsFilterCommand;
 const deserializeAws_restJson1CreateFindingsFilterCommandError = async (output, context) => {
@@ -1650,7 +1581,6 @@ const deserializeAws_restJson1CreateFindingsFilterCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1676,29 +1606,26 @@ const deserializeAws_restJson1CreateFindingsFilterCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateInvitationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateInvitationsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        unprocessedAccounts: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+    if (data.unprocessedAccounts != null) {
         contents.unprocessedAccounts = deserializeAws_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateInvitationsCommand = deserializeAws_restJson1CreateInvitationsCommand;
 const deserializeAws_restJson1CreateInvitationsCommandError = async (output, context) => {
@@ -1706,7 +1633,6 @@ const deserializeAws_restJson1CreateInvitationsCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1732,29 +1658,26 @@ const deserializeAws_restJson1CreateInvitationsCommandError = async (output, con
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateMemberCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateMemberCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        arn: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateMemberCommand = deserializeAws_restJson1CreateMemberCommand;
 const deserializeAws_restJson1CreateMemberCommandError = async (output, context) => {
@@ -1762,7 +1685,6 @@ const deserializeAws_restJson1CreateMemberCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1788,25 +1710,23 @@ const deserializeAws_restJson1CreateMemberCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateSampleFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateSampleFindingsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateSampleFindingsCommand = deserializeAws_restJson1CreateSampleFindingsCommand;
 const deserializeAws_restJson1CreateSampleFindingsCommandError = async (output, context) => {
@@ -1814,7 +1734,6 @@ const deserializeAws_restJson1CreateSampleFindingsCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1840,29 +1759,26 @@ const deserializeAws_restJson1CreateSampleFindingsCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeclineInvitationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeclineInvitationsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        unprocessedAccounts: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+    if (data.unprocessedAccounts != null) {
         contents.unprocessedAccounts = deserializeAws_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeclineInvitationsCommand = deserializeAws_restJson1DeclineInvitationsCommand;
 const deserializeAws_restJson1DeclineInvitationsCommandError = async (output, context) => {
@@ -1870,7 +1786,6 @@ const deserializeAws_restJson1DeclineInvitationsCommandError = async (output, co
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1896,25 +1811,23 @@ const deserializeAws_restJson1DeclineInvitationsCommandError = async (output, co
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteCustomDataIdentifierCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteCustomDataIdentifierCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteCustomDataIdentifierCommand = deserializeAws_restJson1DeleteCustomDataIdentifierCommand;
 const deserializeAws_restJson1DeleteCustomDataIdentifierCommandError = async (output, context) => {
@@ -1922,7 +1835,6 @@ const deserializeAws_restJson1DeleteCustomDataIdentifierCommandError = async (ou
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1948,25 +1860,23 @@ const deserializeAws_restJson1DeleteCustomDataIdentifierCommandError = async (ou
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteFindingsFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteFindingsFilterCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteFindingsFilterCommand = deserializeAws_restJson1DeleteFindingsFilterCommand;
 const deserializeAws_restJson1DeleteFindingsFilterCommandError = async (output, context) => {
@@ -1974,7 +1884,6 @@ const deserializeAws_restJson1DeleteFindingsFilterCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2000,29 +1909,26 @@ const deserializeAws_restJson1DeleteFindingsFilterCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteInvitationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteInvitationsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        unprocessedAccounts: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+    if (data.unprocessedAccounts != null) {
         contents.unprocessedAccounts = deserializeAws_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteInvitationsCommand = deserializeAws_restJson1DeleteInvitationsCommand;
 const deserializeAws_restJson1DeleteInvitationsCommandError = async (output, context) => {
@@ -2030,7 +1936,6 @@ const deserializeAws_restJson1DeleteInvitationsCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2056,25 +1961,23 @@ const deserializeAws_restJson1DeleteInvitationsCommandError = async (output, con
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteMemberCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteMemberCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteMemberCommand = deserializeAws_restJson1DeleteMemberCommand;
 const deserializeAws_restJson1DeleteMemberCommandError = async (output, context) => {
@@ -2082,7 +1985,6 @@ const deserializeAws_restJson1DeleteMemberCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2108,33 +2010,29 @@ const deserializeAws_restJson1DeleteMemberCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeBucketsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeBucketsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        buckets: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeBucketsCommand = deserializeAws_restJson1DescribeBucketsCommand;
 const deserializeAws_restJson1DescribeBucketsCommandError = async (output, context) => {
@@ -2142,7 +2040,6 @@ const deserializeAws_restJson1DescribeBucketsCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2168,105 +2065,83 @@ const deserializeAws_restJson1DescribeBucketsCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeClassificationJobCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeClassificationJobCommandError(output, context);
     }
-    const contents = {
+    const 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,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.clientToken !== undefined && data.clientToken !== null) {
+    if (data.clientToken != null) {
         contents.clientToken = (0, smithy_client_1.expectString)(data.clientToken);
     }
-    if (data.createdAt !== undefined && data.createdAt !== null) {
+    if (data.createdAt != null) {
         contents.createdAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.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 = (0, smithy_client_1.expectString)(data.description);
     }
-    if (data.initialRun !== undefined && data.initialRun !== null) {
+    if (data.initialRun != null) {
         contents.initialRun = (0, smithy_client_1.expectBoolean)(data.initialRun);
     }
-    if (data.jobArn !== undefined && data.jobArn !== null) {
+    if (data.jobArn != null) {
         contents.jobArn = (0, smithy_client_1.expectString)(data.jobArn);
     }
-    if (data.jobId !== undefined && data.jobId !== null) {
+    if (data.jobId != null) {
         contents.jobId = (0, smithy_client_1.expectString)(data.jobId);
     }
-    if (data.jobStatus !== undefined && data.jobStatus !== null) {
+    if (data.jobStatus != null) {
         contents.jobStatus = (0, smithy_client_1.expectString)(data.jobStatus);
     }
-    if (data.jobType !== undefined && data.jobType !== null) {
+    if (data.jobType != null) {
         contents.jobType = (0, smithy_client_1.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 = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.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 = (0, smithy_client_1.expectString)(data.managedDataIdentifierSelector);
     }
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.name = (0, smithy_client_1.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 = (0, smithy_client_1.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 Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeClassificationJobCommand = deserializeAws_restJson1DescribeClassificationJobCommand;
 const deserializeAws_restJson1DescribeClassificationJobCommandError = async (output, context) => {
@@ -2274,7 +2149,6 @@ const deserializeAws_restJson1DescribeClassificationJobCommandError = async (out
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2300,33 +2174,29 @@ const deserializeAws_restJson1DescribeClassificationJobCommandError = async (out
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeOrganizationConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeOrganizationConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        autoEnable: undefined,
-        maxAccountLimitReached: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.autoEnable !== undefined && data.autoEnable !== null) {
+    if (data.autoEnable != null) {
         contents.autoEnable = (0, smithy_client_1.expectBoolean)(data.autoEnable);
     }
-    if (data.maxAccountLimitReached !== undefined && data.maxAccountLimitReached !== null) {
+    if (data.maxAccountLimitReached != null) {
         contents.maxAccountLimitReached = (0, smithy_client_1.expectBoolean)(data.maxAccountLimitReached);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeOrganizationConfigurationCommand = deserializeAws_restJson1DescribeOrganizationConfigurationCommand;
 const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = async (output, context) => {
@@ -2334,7 +2204,6 @@ const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = as
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2360,25 +2229,23 @@ const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = as
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisableMacieCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisableMacieCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisableMacieCommand = deserializeAws_restJson1DisableMacieCommand;
 const deserializeAws_restJson1DisableMacieCommandError = async (output, context) => {
@@ -2386,7 +2253,6 @@ const deserializeAws_restJson1DisableMacieCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2412,25 +2278,23 @@ const deserializeAws_restJson1DisableMacieCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisableOrganizationAdminAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisableOrganizationAdminAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisableOrganizationAdminAccountCommand = deserializeAws_restJson1DisableOrganizationAdminAccountCommand;
 const deserializeAws_restJson1DisableOrganizationAdminAccountCommandError = async (output, context) => {
@@ -2438,7 +2302,6 @@ const deserializeAws_restJson1DisableOrganizationAdminAccountCommandError = asyn
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2464,25 +2327,23 @@ const deserializeAws_restJson1DisableOrganizationAdminAccountCommandError = asyn
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisassociateFromAdministratorAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisassociateFromAdministratorAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisassociateFromAdministratorAccountCommand = deserializeAws_restJson1DisassociateFromAdministratorAccountCommand;
 const deserializeAws_restJson1DisassociateFromAdministratorAccountCommandError = async (output, context) => {
@@ -2490,7 +2351,6 @@ const deserializeAws_restJson1DisassociateFromAdministratorAccountCommandError =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2516,25 +2376,23 @@ const deserializeAws_restJson1DisassociateFromAdministratorAccountCommandError =
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisassociateFromMasterAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisassociateFromMasterAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisassociateFromMasterAccountCommand = deserializeAws_restJson1DisassociateFromMasterAccountCommand;
 const deserializeAws_restJson1DisassociateFromMasterAccountCommandError = async (output, context) => {
@@ -2542,7 +2400,6 @@ const deserializeAws_restJson1DisassociateFromMasterAccountCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2568,25 +2425,23 @@ const deserializeAws_restJson1DisassociateFromMasterAccountCommandError = async
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisassociateMemberCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisassociateMemberCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisassociateMemberCommand = deserializeAws_restJson1DisassociateMemberCommand;
 const deserializeAws_restJson1DisassociateMemberCommandError = async (output, context) => {
@@ -2594,7 +2449,6 @@ const deserializeAws_restJson1DisassociateMemberCommandError = async (output, co
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2620,25 +2474,23 @@ const deserializeAws_restJson1DisassociateMemberCommandError = async (output, co
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1EnableMacieCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1EnableMacieCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1EnableMacieCommand = deserializeAws_restJson1EnableMacieCommand;
 const deserializeAws_restJson1EnableMacieCommandError = async (output, context) => {
@@ -2646,7 +2498,6 @@ const deserializeAws_restJson1EnableMacieCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2672,25 +2523,23 @@ const deserializeAws_restJson1EnableMacieCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1EnableOrganizationAdminAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1EnableOrganizationAdminAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1EnableOrganizationAdminAccountCommand = deserializeAws_restJson1EnableOrganizationAdminAccountCommand;
 const deserializeAws_restJson1EnableOrganizationAdminAccountCommandError = async (output, context) => {
@@ -2698,7 +2547,6 @@ const deserializeAws_restJson1EnableOrganizationAdminAccountCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2724,29 +2572,26 @@ const deserializeAws_restJson1EnableOrganizationAdminAccountCommandError = async
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetAdministratorAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetAdministratorAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        administrator: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.administrator !== undefined && data.administrator !== null) {
+    if (data.administrator != null) {
         contents.administrator = deserializeAws_restJson1Invitation(data.administrator, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetAdministratorAccountCommand = deserializeAws_restJson1GetAdministratorAccountCommand;
 const deserializeAws_restJson1GetAdministratorAccountCommandError = async (output, context) => {
@@ -2754,7 +2599,6 @@ const deserializeAws_restJson1GetAdministratorAccountCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2780,79 +2624,63 @@ const deserializeAws_restJson1GetAdministratorAccountCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetBucketStatisticsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetBucketStatisticsCommandError(output, context);
     }
-    const contents = {
+    const 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,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.bucketCount !== undefined && data.bucketCount !== null) {
+    if (data.bucketCount != null) {
         contents.bucketCount = (0, smithy_client_1.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 = (0, smithy_client_1.expectLong)(data.classifiableObjectCount);
     }
-    if (data.classifiableSizeInBytes !== undefined && data.classifiableSizeInBytes !== null) {
+    if (data.classifiableSizeInBytes != null) {
         contents.classifiableSizeInBytes = (0, smithy_client_1.expectLong)(data.classifiableSizeInBytes);
     }
-    if (data.lastUpdated !== undefined && data.lastUpdated !== null) {
+    if (data.lastUpdated != null) {
         contents.lastUpdated = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.lastUpdated));
     }
-    if (data.objectCount !== undefined && data.objectCount !== null) {
+    if (data.objectCount != null) {
         contents.objectCount = (0, smithy_client_1.expectLong)(data.objectCount);
     }
-    if (data.sizeInBytes !== undefined && data.sizeInBytes !== null) {
+    if (data.sizeInBytes != null) {
         contents.sizeInBytes = (0, smithy_client_1.expectLong)(data.sizeInBytes);
     }
-    if (data.sizeInBytesCompressed !== undefined && data.sizeInBytesCompressed !== null) {
+    if (data.sizeInBytesCompressed != null) {
         contents.sizeInBytesCompressed = (0, smithy_client_1.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 Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetBucketStatisticsCommand = deserializeAws_restJson1GetBucketStatisticsCommand;
 const deserializeAws_restJson1GetBucketStatisticsCommandError = async (output, context) => {
@@ -2860,7 +2688,6 @@ const deserializeAws_restJson1GetBucketStatisticsCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2886,29 +2713,26 @@ const deserializeAws_restJson1GetBucketStatisticsCommandError = async (output, c
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetClassificationExportConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetClassificationExportConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        configuration: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.configuration !== undefined && data.configuration !== null) {
+    if (data.configuration != null) {
         contents.configuration = deserializeAws_restJson1ClassificationExportConfiguration(data.configuration, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetClassificationExportConfigurationCommand = deserializeAws_restJson1GetClassificationExportConfigurationCommand;
 const deserializeAws_restJson1GetClassificationExportConfigurationCommandError = async (output, context) => {
@@ -2916,7 +2740,6 @@ const deserializeAws_restJson1GetClassificationExportConfigurationCommandError =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2942,73 +2765,59 @@ const deserializeAws_restJson1GetClassificationExportConfigurationCommandError =
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetCustomDataIdentifierCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetCustomDataIdentifierCommandError(output, context);
     }
-    const contents = {
+    const 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,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    if (data.createdAt !== undefined && data.createdAt !== null) {
+    if (data.createdAt != null) {
         contents.createdAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.createdAt));
     }
-    if (data.deleted !== undefined && data.deleted !== null) {
+    if (data.deleted != null) {
         contents.deleted = (0, smithy_client_1.expectBoolean)(data.deleted);
     }
-    if (data.description !== undefined && data.description !== null) {
+    if (data.description != null) {
         contents.description = (0, smithy_client_1.expectString)(data.description);
     }
-    if (data.id !== undefined && data.id !== null) {
+    if (data.id != null) {
         contents.id = (0, smithy_client_1.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 = (0, smithy_client_1.expectInt32)(data.maximumMatchDistance);
     }
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.name = (0, smithy_client_1.expectString)(data.name);
     }
-    if (data.regex !== undefined && data.regex !== null) {
+    if (data.regex != null) {
         contents.regex = (0, smithy_client_1.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 Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetCustomDataIdentifierCommand = deserializeAws_restJson1GetCustomDataIdentifierCommand;
 const deserializeAws_restJson1GetCustomDataIdentifierCommandError = async (output, context) => {
@@ -3016,7 +2825,6 @@ const deserializeAws_restJson1GetCustomDataIdentifierCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3042,29 +2850,26 @@ const deserializeAws_restJson1GetCustomDataIdentifierCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetFindingsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        findings: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.findings !== undefined && data.findings !== null) {
+    if (data.findings != null) {
         contents.findings = deserializeAws_restJson1__listOfFinding(data.findings, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetFindingsCommand = deserializeAws_restJson1GetFindingsCommand;
 const deserializeAws_restJson1GetFindingsCommandError = async (output, context) => {
@@ -3072,7 +2877,6 @@ const deserializeAws_restJson1GetFindingsCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3098,57 +2902,47 @@ const deserializeAws_restJson1GetFindingsCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetFindingsFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetFindingsFilterCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        action: undefined,
-        arn: undefined,
-        description: undefined,
-        findingCriteria: undefined,
-        id: undefined,
-        name: undefined,
-        position: undefined,
-        tags: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.action !== undefined && data.action !== null) {
+    if (data.action != null) {
         contents.action = (0, smithy_client_1.expectString)(data.action);
     }
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    if (data.description !== undefined && data.description !== null) {
+    if (data.description != null) {
         contents.description = (0, smithy_client_1.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 = (0, smithy_client_1.expectString)(data.id);
     }
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.name = (0, smithy_client_1.expectString)(data.name);
     }
-    if (data.position !== undefined && data.position !== null) {
+    if (data.position != null) {
         contents.position = (0, smithy_client_1.expectInt32)(data.position);
     }
-    if (data.tags !== undefined && data.tags !== null) {
+    if (data.tags != null) {
         contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetFindingsFilterCommand = deserializeAws_restJson1GetFindingsFilterCommand;
 const deserializeAws_restJson1GetFindingsFilterCommandError = async (output, context) => {
@@ -3156,7 +2950,6 @@ const deserializeAws_restJson1GetFindingsFilterCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3182,29 +2975,26 @@ const deserializeAws_restJson1GetFindingsFilterCommandError = async (output, con
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetFindingsPublicationConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetFindingsPublicationConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        securityHubConfiguration: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.securityHubConfiguration !== undefined && data.securityHubConfiguration !== null) {
+    if (data.securityHubConfiguration != null) {
         contents.securityHubConfiguration = deserializeAws_restJson1SecurityHubConfiguration(data.securityHubConfiguration, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetFindingsPublicationConfigurationCommand = deserializeAws_restJson1GetFindingsPublicationConfigurationCommand;
 const deserializeAws_restJson1GetFindingsPublicationConfigurationCommandError = async (output, context) => {
@@ -3212,7 +3002,6 @@ const deserializeAws_restJson1GetFindingsPublicationConfigurationCommandError =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3238,29 +3027,26 @@ const deserializeAws_restJson1GetFindingsPublicationConfigurationCommandError =
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetFindingStatisticsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetFindingStatisticsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        countsByGroup: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.countsByGroup !== undefined && data.countsByGroup !== null) {
+    if (data.countsByGroup != null) {
         contents.countsByGroup = deserializeAws_restJson1__listOfGroupCount(data.countsByGroup, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetFindingStatisticsCommand = deserializeAws_restJson1GetFindingStatisticsCommand;
 const deserializeAws_restJson1GetFindingStatisticsCommandError = async (output, context) => {
@@ -3268,7 +3054,6 @@ const deserializeAws_restJson1GetFindingStatisticsCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3294,29 +3079,26 @@ const deserializeAws_restJson1GetFindingStatisticsCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetInvitationsCountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetInvitationsCountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        invitationsCount: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.invitationsCount !== undefined && data.invitationsCount !== null) {
+    if (data.invitationsCount != null) {
         contents.invitationsCount = (0, smithy_client_1.expectLong)(data.invitationsCount);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetInvitationsCountCommand = deserializeAws_restJson1GetInvitationsCountCommand;
 const deserializeAws_restJson1GetInvitationsCountCommandError = async (output, context) => {
@@ -3324,7 +3106,6 @@ const deserializeAws_restJson1GetInvitationsCountCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3350,45 +3131,38 @@ const deserializeAws_restJson1GetInvitationsCountCommandError = async (output, c
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetMacieSessionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetMacieSessionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        createdAt: undefined,
-        findingPublishingFrequency: undefined,
-        serviceRole: undefined,
-        status: undefined,
-        updatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.createdAt !== undefined && data.createdAt !== null) {
+    if (data.createdAt != null) {
         contents.createdAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.createdAt));
     }
-    if (data.findingPublishingFrequency !== undefined && data.findingPublishingFrequency !== null) {
+    if (data.findingPublishingFrequency != null) {
         contents.findingPublishingFrequency = (0, smithy_client_1.expectString)(data.findingPublishingFrequency);
     }
-    if (data.serviceRole !== undefined && data.serviceRole !== null) {
+    if (data.serviceRole != null) {
         contents.serviceRole = (0, smithy_client_1.expectString)(data.serviceRole);
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.status = (0, smithy_client_1.expectString)(data.status);
     }
-    if (data.updatedAt !== undefined && data.updatedAt !== null) {
+    if (data.updatedAt != null) {
         contents.updatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.updatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetMacieSessionCommand = deserializeAws_restJson1GetMacieSessionCommand;
 const deserializeAws_restJson1GetMacieSessionCommandError = async (output, context) => {
@@ -3396,7 +3170,6 @@ const deserializeAws_restJson1GetMacieSessionCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3422,29 +3195,26 @@ const deserializeAws_restJson1GetMacieSessionCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetMasterAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetMasterAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        master: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.master !== undefined && data.master !== null) {
+    if (data.master != null) {
         contents.master = deserializeAws_restJson1Invitation(data.master, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetMasterAccountCommand = deserializeAws_restJson1GetMasterAccountCommand;
 const deserializeAws_restJson1GetMasterAccountCommandError = async (output, context) => {
@@ -3452,7 +3222,6 @@ const deserializeAws_restJson1GetMasterAccountCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3478,61 +3247,50 @@ const deserializeAws_restJson1GetMasterAccountCommandError = async (output, cont
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetMemberCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetMemberCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        accountId: undefined,
-        administratorAccountId: undefined,
-        arn: undefined,
-        email: undefined,
-        invitedAt: undefined,
-        masterAccountId: undefined,
-        relationshipStatus: undefined,
-        tags: undefined,
-        updatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.accountId !== undefined && data.accountId !== null) {
+    if (data.accountId != null) {
         contents.accountId = (0, smithy_client_1.expectString)(data.accountId);
     }
-    if (data.administratorAccountId !== undefined && data.administratorAccountId !== null) {
+    if (data.administratorAccountId != null) {
         contents.administratorAccountId = (0, smithy_client_1.expectString)(data.administratorAccountId);
     }
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    if (data.email !== undefined && data.email !== null) {
+    if (data.email != null) {
         contents.email = (0, smithy_client_1.expectString)(data.email);
     }
-    if (data.invitedAt !== undefined && data.invitedAt !== null) {
+    if (data.invitedAt != null) {
         contents.invitedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.invitedAt));
     }
-    if (data.masterAccountId !== undefined && data.masterAccountId !== null) {
+    if (data.masterAccountId != null) {
         contents.masterAccountId = (0, smithy_client_1.expectString)(data.masterAccountId);
     }
-    if (data.relationshipStatus !== undefined && data.relationshipStatus !== null) {
+    if (data.relationshipStatus != null) {
         contents.relationshipStatus = (0, smithy_client_1.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 = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.updatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetMemberCommand = deserializeAws_restJson1GetMemberCommand;
 const deserializeAws_restJson1GetMemberCommandError = async (output, context) => {
@@ -3540,7 +3298,6 @@ const deserializeAws_restJson1GetMemberCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3566,37 +3323,176 @@ const deserializeAws_restJson1GetMemberCommandError = async (output, context) =>
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
+            });
+    }
+};
+const deserializeAws_restJson1GetRevealConfigurationCommand = async (output, context) => {
+    if (output.statusCode !== 200 && output.statusCode >= 300) {
+        return deserializeAws_restJson1GetRevealConfigurationCommandError(output, context);
+    }
+    const contents = map({
+        $metadata: deserializeMetadata(output),
+    });
+    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    if (data.configuration != null) {
+        contents.configuration = deserializeAws_restJson1RevealConfiguration(data.configuration, context);
+    }
+    return contents;
+};
+exports.deserializeAws_restJson1GetRevealConfigurationCommand = deserializeAws_restJson1GetRevealConfigurationCommand;
+const deserializeAws_restJson1GetRevealConfigurationCommandError = async (output, context) => {
+    const parsedOutput = {
+        ...output,
+        body: await parseBody(output.body, context),
+    };
+    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
+    switch (errorCode) {
+        case "AccessDeniedException":
+        case "com.amazonaws.macie2#AccessDeniedException":
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
+        case "InternalServerException":
+        case "com.amazonaws.macie2#InternalServerException":
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
+        case "ThrottlingException":
+        case "com.amazonaws.macie2#ThrottlingException":
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
+        case "ValidationException":
+        case "com.amazonaws.macie2#ValidationException":
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
+        default:
+            const parsedBody = parsedOutput.body;
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
+            });
+    }
+};
+const deserializeAws_restJson1GetSensitiveDataOccurrencesCommand = async (output, context) => {
+    if (output.statusCode !== 200 && output.statusCode >= 300) {
+        return deserializeAws_restJson1GetSensitiveDataOccurrencesCommandError(output, context);
+    }
+    const contents = map({
+        $metadata: deserializeMetadata(output),
+    });
+    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    if (data.error != null) {
+        contents.error = (0, smithy_client_1.expectString)(data.error);
+    }
+    if (data.sensitiveDataOccurrences != null) {
+        contents.sensitiveDataOccurrences = deserializeAws_restJson1SensitiveDataOccurrences(data.sensitiveDataOccurrences, context);
+    }
+    if (data.status != null) {
+        contents.status = (0, smithy_client_1.expectString)(data.status);
+    }
+    return contents;
+};
+exports.deserializeAws_restJson1GetSensitiveDataOccurrencesCommand = deserializeAws_restJson1GetSensitiveDataOccurrencesCommand;
+const deserializeAws_restJson1GetSensitiveDataOccurrencesCommandError = async (output, context) => {
+    const parsedOutput = {
+        ...output,
+        body: await parseBody(output.body, context),
+    };
+    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
+    switch (errorCode) {
+        case "AccessDeniedException":
+        case "com.amazonaws.macie2#AccessDeniedException":
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
+        case "InternalServerException":
+        case "com.amazonaws.macie2#InternalServerException":
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
+        case "ResourceNotFoundException":
+        case "com.amazonaws.macie2#ResourceNotFoundException":
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
+        case "ServiceQuotaExceededException":
+        case "com.amazonaws.macie2#ServiceQuotaExceededException":
+            throw await deserializeAws_restJson1ServiceQuotaExceededExceptionResponse(parsedOutput, context);
+        case "ThrottlingException":
+        case "com.amazonaws.macie2#ThrottlingException":
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
+        case "UnprocessableEntityException":
+        case "com.amazonaws.macie2#UnprocessableEntityException":
+            throw await deserializeAws_restJson1UnprocessableEntityExceptionResponse(parsedOutput, context);
+        default:
+            const parsedBody = parsedOutput.body;
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
+            });
+    }
+};
+const deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand = async (output, context) => {
+    if (output.statusCode !== 200 && output.statusCode >= 300) {
+        return deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommandError(output, context);
+    }
+    const contents = map({
+        $metadata: deserializeMetadata(output),
+    });
+    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    if (data.code != null) {
+        contents.code = (0, smithy_client_1.expectString)(data.code);
+    }
+    if (data.reasons != null) {
+        contents.reasons = deserializeAws_restJson1__listOfUnavailabilityReasonCode(data.reasons, context);
+    }
+    return contents;
+};
+exports.deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand = deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommand;
+const deserializeAws_restJson1GetSensitiveDataOccurrencesAvailabilityCommandError = async (output, context) => {
+    const parsedOutput = {
+        ...output,
+        body: await parseBody(output.body, context),
+    };
+    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
+    switch (errorCode) {
+        case "AccessDeniedException":
+        case "com.amazonaws.macie2#AccessDeniedException":
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
+        case "InternalServerException":
+        case "com.amazonaws.macie2#InternalServerException":
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
+        case "ResourceNotFoundException":
+        case "com.amazonaws.macie2#ResourceNotFoundException":
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
+        case "ThrottlingException":
+        case "com.amazonaws.macie2#ThrottlingException":
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
+        default:
+            const parsedBody = parsedOutput.body;
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetUsageStatisticsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetUsageStatisticsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        nextToken: undefined,
-        records: undefined,
-        timeRange: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.nextToken !== undefined && data.nextToken !== null) {
+    if (data.nextToken != null) {
         contents.nextToken = (0, smithy_client_1.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 = (0, smithy_client_1.expectString)(data.timeRange);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetUsageStatisticsCommand = deserializeAws_restJson1GetUsageStatisticsCommand;
 const deserializeAws_restJson1GetUsageStatisticsCommandError = async (output, context) => {
@@ -3604,7 +3500,6 @@ const deserializeAws_restJson1GetUsageStatisticsCommandError = async (output, co
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3630,33 +3525,29 @@ const deserializeAws_restJson1GetUsageStatisticsCommandError = async (output, co
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetUsageTotalsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetUsageTotalsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        timeRange: undefined,
-        usageTotals: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.timeRange !== undefined && data.timeRange !== null) {
+    if (data.timeRange != null) {
         contents.timeRange = (0, smithy_client_1.expectString)(data.timeRange);
     }
-    if (data.usageTotals !== undefined && data.usageTotals !== null) {
+    if (data.usageTotals != null) {
         contents.usageTotals = deserializeAws_restJson1__listOfUsageTotal(data.usageTotals, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetUsageTotalsCommand = deserializeAws_restJson1GetUsageTotalsCommand;
 const deserializeAws_restJson1GetUsageTotalsCommandError = async (output, context) => {
@@ -3664,7 +3555,6 @@ const deserializeAws_restJson1GetUsageTotalsCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3690,33 +3580,29 @@ const deserializeAws_restJson1GetUsageTotalsCommandError = async (output, contex
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListClassificationJobsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListClassificationJobsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        items: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListClassificationJobsCommand = deserializeAws_restJson1ListClassificationJobsCommand;
 const deserializeAws_restJson1ListClassificationJobsCommandError = async (output, context) => {
@@ -3724,7 +3610,6 @@ const deserializeAws_restJson1ListClassificationJobsCommandError = async (output
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3750,33 +3635,29 @@ const deserializeAws_restJson1ListClassificationJobsCommandError = async (output
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListCustomDataIdentifiersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListCustomDataIdentifiersCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        items: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListCustomDataIdentifiersCommand = deserializeAws_restJson1ListCustomDataIdentifiersCommand;
 const deserializeAws_restJson1ListCustomDataIdentifiersCommandError = async (output, context) => {
@@ -3784,7 +3665,6 @@ const deserializeAws_restJson1ListCustomDataIdentifiersCommandError = async (out
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3810,33 +3690,29 @@ const deserializeAws_restJson1ListCustomDataIdentifiersCommandError = async (out
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListFindingsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        findingIds: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListFindingsCommand = deserializeAws_restJson1ListFindingsCommand;
 const deserializeAws_restJson1ListFindingsCommandError = async (output, context) => {
@@ -3844,7 +3720,6 @@ const deserializeAws_restJson1ListFindingsCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3870,33 +3745,29 @@ const deserializeAws_restJson1ListFindingsCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListFindingsFiltersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListFindingsFiltersCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        findingsFilterListItems: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListFindingsFiltersCommand = deserializeAws_restJson1ListFindingsFiltersCommand;
 const deserializeAws_restJson1ListFindingsFiltersCommandError = async (output, context) => {
@@ -3904,7 +3775,6 @@ const deserializeAws_restJson1ListFindingsFiltersCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3930,33 +3800,29 @@ const deserializeAws_restJson1ListFindingsFiltersCommandError = async (output, c
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListInvitationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListInvitationsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        invitations: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListInvitationsCommand = deserializeAws_restJson1ListInvitationsCommand;
 const deserializeAws_restJson1ListInvitationsCommandError = async (output, context) => {
@@ -3964,7 +3830,6 @@ const deserializeAws_restJson1ListInvitationsCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3990,33 +3855,29 @@ const deserializeAws_restJson1ListInvitationsCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListManagedDataIdentifiersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListManagedDataIdentifiersCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        items: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListManagedDataIdentifiersCommand = deserializeAws_restJson1ListManagedDataIdentifiersCommand;
 const deserializeAws_restJson1ListManagedDataIdentifiersCommandError = async (output, context) => {
@@ -4024,38 +3885,30 @@ const deserializeAws_restJson1ListManagedDataIdentifiersCommandError = async (ou
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        default:
-            const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
-            });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
-    }
+    const parsedBody = parsedOutput.body;
+    (0, smithy_client_1.throwDefaultError)({
+        output,
+        parsedBody,
+        exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+        errorCode,
+    });
 };
 const deserializeAws_restJson1ListMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListMembersCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        members: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListMembersCommand = deserializeAws_restJson1ListMembersCommand;
 const deserializeAws_restJson1ListMembersCommandError = async (output, context) => {
@@ -4063,7 +3916,6 @@ const deserializeAws_restJson1ListMembersCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4089,33 +3941,29 @@ const deserializeAws_restJson1ListMembersCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListOrganizationAdminAccountsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListOrganizationAdminAccountsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        adminAccounts: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListOrganizationAdminAccountsCommand = deserializeAws_restJson1ListOrganizationAdminAccountsCommand;
 const deserializeAws_restJson1ListOrganizationAdminAccountsCommandError = async (output, context) => {
@@ -4123,7 +3971,6 @@ const deserializeAws_restJson1ListOrganizationAdminAccountsCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4149,29 +3996,26 @@ const deserializeAws_restJson1ListOrganizationAdminAccountsCommandError = async
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListTagsForResourceCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        tags: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.tags !== undefined && data.tags !== null) {
+    if (data.tags != null) {
         contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListTagsForResourceCommand = deserializeAws_restJson1ListTagsForResourceCommand;
 const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, context) => {
@@ -4179,34 +4023,27 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        default:
-            const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
-            });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
-    }
+    const parsedBody = parsedOutput.body;
+    (0, smithy_client_1.throwDefaultError)({
+        output,
+        parsedBody,
+        exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+        errorCode,
+    });
 };
 const deserializeAws_restJson1PutClassificationExportConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1PutClassificationExportConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        configuration: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.configuration !== undefined && data.configuration !== null) {
+    if (data.configuration != null) {
         contents.configuration = deserializeAws_restJson1ClassificationExportConfiguration(data.configuration, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1PutClassificationExportConfigurationCommand = deserializeAws_restJson1PutClassificationExportConfigurationCommand;
 const deserializeAws_restJson1PutClassificationExportConfigurationCommandError = async (output, context) => {
@@ -4214,7 +4051,6 @@ const deserializeAws_restJson1PutClassificationExportConfigurationCommandError =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4240,25 +4076,23 @@ const deserializeAws_restJson1PutClassificationExportConfigurationCommandError =
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1PutFindingsPublicationConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1PutFindingsPublicationConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1PutFindingsPublicationConfigurationCommand = deserializeAws_restJson1PutFindingsPublicationConfigurationCommand;
 const deserializeAws_restJson1PutFindingsPublicationConfigurationCommandError = async (output, context) => {
@@ -4266,7 +4100,6 @@ const deserializeAws_restJson1PutFindingsPublicationConfigurationCommandError =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4292,33 +4125,29 @@ const deserializeAws_restJson1PutFindingsPublicationConfigurationCommandError =
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1SearchResourcesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1SearchResourcesCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        matchingResources: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1SearchResourcesCommand = deserializeAws_restJson1SearchResourcesCommand;
 const deserializeAws_restJson1SearchResourcesCommandError = async (output, context) => {
@@ -4326,7 +4155,6 @@ const deserializeAws_restJson1SearchResourcesCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4352,25 +4180,23 @@ const deserializeAws_restJson1SearchResourcesCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1TagResourceCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1TagResourceCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1TagResourceCommand = deserializeAws_restJson1TagResourceCommand;
 const deserializeAws_restJson1TagResourceCommandError = async (output, context) => {
@@ -4378,34 +4204,27 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        default:
-            const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
-            });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
-    }
+    const parsedBody = parsedOutput.body;
+    (0, smithy_client_1.throwDefaultError)({
+        output,
+        parsedBody,
+        exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+        errorCode,
+    });
 };
 const deserializeAws_restJson1TestCustomDataIdentifierCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1TestCustomDataIdentifierCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        matchCount: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.matchCount !== undefined && data.matchCount !== null) {
+    if (data.matchCount != null) {
         contents.matchCount = (0, smithy_client_1.expectInt32)(data.matchCount);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1TestCustomDataIdentifierCommand = deserializeAws_restJson1TestCustomDataIdentifierCommand;
 const deserializeAws_restJson1TestCustomDataIdentifierCommandError = async (output, context) => {
@@ -4413,7 +4232,6 @@ const deserializeAws_restJson1TestCustomDataIdentifierCommandError = async (outp
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4439,25 +4257,23 @@ const deserializeAws_restJson1TestCustomDataIdentifierCommandError = async (outp
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UntagResourceCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1UntagResourceCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UntagResourceCommand = deserializeAws_restJson1UntagResourceCommand;
 const deserializeAws_restJson1UntagResourceCommandError = async (output, context) => {
@@ -4465,30 +4281,24 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        default:
-            const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
-            });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
-    }
+    const parsedBody = parsedOutput.body;
+    (0, smithy_client_1.throwDefaultError)({
+        output,
+        parsedBody,
+        exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+        errorCode,
+    });
 };
 const deserializeAws_restJson1UpdateClassificationJobCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateClassificationJobCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateClassificationJobCommand = deserializeAws_restJson1UpdateClassificationJobCommand;
 const deserializeAws_restJson1UpdateClassificationJobCommandError = async (output, context) => {
@@ -4496,7 +4306,6 @@ const deserializeAws_restJson1UpdateClassificationJobCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4522,33 +4331,29 @@ const deserializeAws_restJson1UpdateClassificationJobCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateFindingsFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateFindingsFilterCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        arn: undefined,
-        id: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    if (data.id !== undefined && data.id !== null) {
+    if (data.id != null) {
         contents.id = (0, smithy_client_1.expectString)(data.id);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateFindingsFilterCommand = deserializeAws_restJson1UpdateFindingsFilterCommand;
 const deserializeAws_restJson1UpdateFindingsFilterCommandError = async (output, context) => {
@@ -4556,7 +4361,6 @@ const deserializeAws_restJson1UpdateFindingsFilterCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4582,25 +4386,23 @@ const deserializeAws_restJson1UpdateFindingsFilterCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateMacieSessionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateMacieSessionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateMacieSessionCommand = deserializeAws_restJson1UpdateMacieSessionCommand;
 const deserializeAws_restJson1UpdateMacieSessionCommandError = async (output, context) => {
@@ -4608,7 +4410,6 @@ const deserializeAws_restJson1UpdateMacieSessionCommandError = async (output, co
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4634,25 +4435,23 @@ const deserializeAws_restJson1UpdateMacieSessionCommandError = async (output, co
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateMemberSessionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateMemberSessionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateMemberSessionCommand = deserializeAws_restJson1UpdateMemberSessionCommand;
 const deserializeAws_restJson1UpdateMemberSessionCommandError = async (output, context) => {
@@ -4660,7 +4459,6 @@ const deserializeAws_restJson1UpdateMemberSessionCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4686,25 +4484,23 @@ const deserializeAws_restJson1UpdateMemberSessionCommandError = async (output, c
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateOrganizationConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateOrganizationConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateOrganizationConfigurationCommand = deserializeAws_restJson1UpdateOrganizationConfigurationCommand;
 const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = async (output, context) => {
@@ -4712,7 +4508,6 @@ const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = asyn
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -4738,20 +4533,62 @@ const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = asyn
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Macie2ServiceException_1.Macie2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
+            });
+    }
+};
+const deserializeAws_restJson1UpdateRevealConfigurationCommand = async (output, context) => {
+    if (output.statusCode !== 200 && output.statusCode >= 300) {
+        return deserializeAws_restJson1UpdateRevealConfigurationCommandError(output, context);
+    }
+    const contents = map({
+        $metadata: deserializeMetadata(output),
+    });
+    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    if (data.configuration != null) {
+        contents.configuration = deserializeAws_restJson1RevealConfiguration(data.configuration, context);
+    }
+    return contents;
+};
+exports.deserializeAws_restJson1UpdateRevealConfigurationCommand = deserializeAws_restJson1UpdateRevealConfigurationCommand;
+const deserializeAws_restJson1UpdateRevealConfigurationCommandError = async (output, context) => {
+    const parsedOutput = {
+        ...output,
+        body: await parseBody(output.body, context),
+    };
+    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
+    switch (errorCode) {
+        case "AccessDeniedException":
+        case "com.amazonaws.macie2#AccessDeniedException":
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
+        case "InternalServerException":
+        case "com.amazonaws.macie2#InternalServerException":
+            throw await deserializeAws_restJson1InternalServerExceptionResponse(parsedOutput, context);
+        case "ThrottlingException":
+        case "com.amazonaws.macie2#ThrottlingException":
+            throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
+        case "ValidationException":
+        case "com.amazonaws.macie2#ValidationException":
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
+        default:
+            const parsedBody = parsedOutput.body;
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Macie2ServiceException_1.Macie2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
+const map = smithy_client_1.map;
 const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.AccessDeniedException({
@@ -4761,9 +4598,9 @@ const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutpu
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ConflictException({
@@ -4773,9 +4610,9 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.InternalServerException({
@@ -4785,9 +4622,9 @@ const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOut
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ResourceNotFoundException({
@@ -4797,9 +4634,9 @@ const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedO
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ServiceQuotaExceededException({
@@ -4809,9 +4646,9 @@ const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (par
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ThrottlingException({
@@ -4820,10 +4657,22 @@ const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput,
     });
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
+const deserializeAws_restJson1UnprocessableEntityExceptionResponse = async (parsedOutput, context) => {
+    const contents = map({});
+    const data = parsedOutput.body;
+    if (data.message != null) {
+        contents.message = (0, smithy_client_1.expectString)(data.message);
+    }
+    const exception = new models_0_1.UnprocessableEntityException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
+};
 const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ValidationException({
@@ -4836,9 +4685,6 @@ const serializeAws_restJson1__listOf__string = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4846,9 +4692,6 @@ const serializeAws_restJson1__listOfCriteriaForJob = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CriteriaForJob(entry, context);
     });
 };
@@ -4856,9 +4699,6 @@ const serializeAws_restJson1__listOfFindingType = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4866,9 +4706,6 @@ const serializeAws_restJson1__listOfJobScopeTerm = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1JobScopeTerm(entry, context);
     });
 };
@@ -4876,9 +4713,6 @@ const serializeAws_restJson1__listOfListJobsFilterTerm = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1ListJobsFilterTerm(entry, context);
     });
 };
@@ -4886,9 +4720,6 @@ const serializeAws_restJson1__listOfS3BucketDefinitionForJob = (input, context)
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1S3BucketDefinitionForJob(entry, context);
     });
 };
@@ -4896,9 +4727,6 @@ const serializeAws_restJson1__listOfSearchResourcesCriteria = (input, context) =
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1SearchResourcesCriteria(entry, context);
     });
 };
@@ -4906,9 +4734,6 @@ const serializeAws_restJson1__listOfSearchResourcesTagCriterionPair = (input, co
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1SearchResourcesTagCriterionPair(entry, context);
     });
 };
@@ -4916,9 +4741,6 @@ const serializeAws_restJson1__listOfTagCriterionPairForJob = (input, context) =>
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1TagCriterionPairForJob(entry, context);
     });
 };
@@ -4926,9 +4748,6 @@ const serializeAws_restJson1__listOfTagValuePair = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1TagValuePair(entry, context);
     });
 };
@@ -4936,9 +4755,6 @@ const serializeAws_restJson1__listOfUsageStatisticsFilter = (input, context) =>
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1UsageStatisticsFilter(entry, context);
     });
 };
@@ -5092,6 +4908,12 @@ const serializeAws_restJson1MonthlySchedule = (input, context) => {
         ...(input.dayOfMonth != null && { dayOfMonth: input.dayOfMonth }),
     };
 };
+const serializeAws_restJson1RevealConfiguration = (input, context) => {
+    return {
+        ...(input.kmsKeyId != null && { kmsKeyId: input.kmsKeyId }),
+        ...(input.status != null && { status: input.status }),
+    };
+};
 const serializeAws_restJson1S3BucketCriteriaForJob = (input, context) => {
     return {
         ...(input.excludes != null && { excludes: serializeAws_restJson1CriteriaBlockForJob(input.excludes, context) }),
@@ -5198,9 +5020,6 @@ const serializeAws_restJson1SeverityLevelList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1SeverityLevel(entry, context);
     });
 };
@@ -5347,6 +5166,17 @@ const deserializeAws_restJson1__listOfCustomDataIdentifierSummary = (output, con
     });
     return retVal;
 };
+const deserializeAws_restJson1__listOfDetectedDataDetails = (output, context) => {
+    const retVal = (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1DetectedDataDetails(entry, context);
+    });
+    return retVal;
+};
 const deserializeAws_restJson1__listOfFinding = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
@@ -5490,6 +5320,17 @@ const deserializeAws_restJson1__listOfTagValuePair = (output, context) => {
     });
     return retVal;
 };
+const deserializeAws_restJson1__listOfUnavailabilityReasonCode = (output, context) => {
+    const retVal = (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return (0, smithy_client_1.expectString)(entry);
+    });
+    return retVal;
+};
 const deserializeAws_restJson1__listOfUnprocessedAccount = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
@@ -5856,6 +5697,11 @@ const deserializeAws_restJson1DefaultDetections = (output, context) => {
     });
     return retVal;
 };
+const deserializeAws_restJson1DetectedDataDetails = (output, context) => {
+    return {
+        value: (0, smithy_client_1.expectString)(output.value),
+    };
+};
 const deserializeAws_restJson1DomainDetails = (output, context) => {
     return {
         domainName: (0, smithy_client_1.expectString)(output.domainName),
@@ -6213,6 +6059,12 @@ const deserializeAws_restJson1ResourcesAffected = (output, context) => {
         s3Object: output.s3Object != null ? deserializeAws_restJson1S3Object(output.s3Object, context) : undefined,
     };
 };
+const deserializeAws_restJson1RevealConfiguration = (output, context) => {
+    return {
+        kmsKeyId: (0, smithy_client_1.expectString)(output.kmsKeyId),
+        status: (0, smithy_client_1.expectString)(output.status),
+    };
+};
 const deserializeAws_restJson1S3Bucket = (output, context) => {
     return {
         allowsUnencryptedObjectUploads: (0, smithy_client_1.expectString)(output.allowsUnencryptedObjectUploads),
@@ -6313,6 +6165,17 @@ const deserializeAws_restJson1SensitiveDataItem = (output, context) => {
         totalCount: (0, smithy_client_1.expectLong)(output.totalCount),
     };
 };
+const deserializeAws_restJson1SensitiveDataOccurrences = (output, context) => {
+    return Object.entries(output).reduce((acc, [key, value]) => {
+        if (value === null) {
+            return acc;
+        }
+        return {
+            ...acc,
+            [key]: deserializeAws_restJson1__listOfDetectedDataDetails(value, context),
+        };
+    }, {});
+};
 const deserializeAws_restJson1ServerSideEncryption = (output, context) => {
     return {
         encryptionType: (0, smithy_client_1.expectString)(output.encryptionType),