@aws-sdk/client-guardduty 3.141.0 → 3.150.0

package/dist-cjs/protocols/Aws_restJson1.js

@@ -14,16 +14,7 @@ const serializeAws_restJson1AcceptAdministratorInvitationCommand = async (input,
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/administrator";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AdministratorId != null && { administratorId: input.AdministratorId }),
@@ -46,16 +37,7 @@ const serializeAws_restJson1AcceptInvitationCommand = async (input, context) =>
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/master";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.InvitationId != null && { invitationId: input.InvitationId }),
@@ -78,16 +60,7 @@ const serializeAws_restJson1ArchiveFindingsCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/findings/archive";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.FindingIds != null && { findingIds: serializeAws_restJson1FindingIds(input.FindingIds, context) }),
@@ -138,16 +111,7 @@ const serializeAws_restJson1CreateFilterCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/filter";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Action != null && { action: input.Action }),
@@ -178,16 +142,7 @@ const serializeAws_restJson1CreateIPSetCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/ipset";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Activate != null && { activate: input.Activate }),
@@ -214,16 +169,7 @@ const serializeAws_restJson1CreateMembersCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/member";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountDetails != null && {
@@ -249,16 +195,7 @@ const serializeAws_restJson1CreatePublishingDestinationCommand = async (input, c
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/publishingDestination";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         clientToken: (_a = input.ClientToken) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)(),
@@ -284,16 +221,7 @@ const serializeAws_restJson1CreateSampleFindingsCommand = async (input, context)
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/findings/create";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.FindingTypes != null && {
@@ -318,16 +246,7 @@ const serializeAws_restJson1CreateThreatIntelSetCommand = async (input, context)
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/threatintelset";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Activate != null && { activate: input.Activate }),
@@ -373,16 +292,7 @@ const serializeAws_restJson1DeleteDetectorCommand = 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 || ""}` + "/detector/{DetectorId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -400,26 +310,8 @@ const serializeAws_restJson1DeleteFilterCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/filter/{FilterName}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.FilterName !== undefined) {
-        const labelValue = input.FilterName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: FilterName.");
-        }
-        resolvedPath = resolvedPath.replace("{FilterName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: FilterName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "FilterName", () => input.FilterName, "{FilterName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -457,26 +349,8 @@ const serializeAws_restJson1DeleteIPSetCommand = 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 || ""}` + "/detector/{DetectorId}/ipset/{IpSetId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.IpSetId !== undefined) {
-        const labelValue = input.IpSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: IpSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{IpSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: IpSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "IpSetId", () => input.IpSetId, "{IpSetId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -495,16 +369,7 @@ const serializeAws_restJson1DeleteMembersCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/member/delete";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -525,26 +390,8 @@ const serializeAws_restJson1DeletePublishingDestinationCommand = async (input, c
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/publishingDestination/{DestinationId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.DestinationId !== undefined) {
-        const labelValue = input.DestinationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DestinationId.");
-        }
-        resolvedPath = resolvedPath.replace("{DestinationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DestinationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DestinationId", () => input.DestinationId, "{DestinationId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -562,26 +409,8 @@ const serializeAws_restJson1DeleteThreatIntelSetCommand = async (input, context)
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/threatintelset/{ThreatIntelSetId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.ThreatIntelSetId !== undefined) {
-        const labelValue = input.ThreatIntelSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: ThreatIntelSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{ThreatIntelSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: ThreatIntelSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ThreatIntelSetId", () => input.ThreatIntelSetId, "{ThreatIntelSetId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -600,16 +429,7 @@ const serializeAws_restJson1DescribeMalwareScansCommand = async (input, context)
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/malware-scans";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.FilterCriteria != null && {
@@ -636,16 +456,7 @@ const serializeAws_restJson1DescribeOrganizationConfigurationCommand = async (in
     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 || ""}` + "/detector/{DetectorId}/admin";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -663,26 +474,8 @@ const serializeAws_restJson1DescribePublishingDestinationCommand = async (input,
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/publishingDestination/{DestinationId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.DestinationId !== undefined) {
-        const labelValue = input.DestinationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DestinationId.");
-        }
-        resolvedPath = resolvedPath.replace("{DestinationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DestinationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DestinationId", () => input.DestinationId, "{DestinationId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -721,16 +514,7 @@ const serializeAws_restJson1DisassociateFromAdministratorAccountCommand = async
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/administrator/disassociate";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -748,16 +532,7 @@ const serializeAws_restJson1DisassociateFromMasterAccountCommand = async (input,
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/master/disassociate";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -777,16 +552,7 @@ const serializeAws_restJson1DisassociateMembersCommand = async (input, context)
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/member/disassociate";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -827,16 +593,7 @@ const serializeAws_restJson1GetAdministratorAccountCommand = 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 || ""}` + "/detector/{DetectorId}/administrator";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -853,16 +610,7 @@ const serializeAws_restJson1GetDetectorCommand = 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 || ""}` + "/detector/{DetectorId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -880,26 +628,8 @@ const serializeAws_restJson1GetFilterCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/filter/{FilterName}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.FilterName !== undefined) {
-        const labelValue = input.FilterName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: FilterName.");
-        }
-        resolvedPath = resolvedPath.replace("{FilterName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: FilterName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "FilterName", () => input.FilterName, "{FilterName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -918,16 +648,7 @@ const serializeAws_restJson1GetFindingsCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/findings/get";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.FindingIds != null && { findingIds: serializeAws_restJson1FindingIds(input.FindingIds, context) }),
@@ -953,16 +674,7 @@ const serializeAws_restJson1GetFindingsStatisticsCommand = async (input, context
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/findings/statistics";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.FindingCriteria != null && {
@@ -1006,26 +718,8 @@ const serializeAws_restJson1GetIPSetCommand = 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 || ""}` + "/detector/{DetectorId}/ipset/{IpSetId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.IpSetId !== undefined) {
-        const labelValue = input.IpSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: IpSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{IpSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: IpSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "IpSetId", () => input.IpSetId, "{IpSetId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1043,16 +737,7 @@ const serializeAws_restJson1GetMalwareScanSettingsCommand = async (input, contex
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/malware-scan-settings";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1069,16 +754,7 @@ const serializeAws_restJson1GetMasterAccountCommand = 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 || ""}` + "/detector/{DetectorId}/master";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1098,16 +774,7 @@ const serializeAws_restJson1GetMemberDetectorsCommand = async (input, context) =
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/member/detector/get";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -1129,16 +796,7 @@ const serializeAws_restJson1GetMembersCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/member/get";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -1161,16 +819,7 @@ const serializeAws_restJson1GetRemainingFreeTrialDaysCommand = async (input, con
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/freeTrial/daysRemaining";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -1191,26 +840,8 @@ const serializeAws_restJson1GetThreatIntelSetCommand = async (input, context) =>
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/threatintelset/{ThreatIntelSetId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.ThreatIntelSetId !== undefined) {
-        const labelValue = input.ThreatIntelSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: ThreatIntelSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{ThreatIntelSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: ThreatIntelSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ThreatIntelSetId", () => input.ThreatIntelSetId, "{ThreatIntelSetId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1229,16 +860,7 @@ const serializeAws_restJson1GetUsageStatisticsCommand = async (input, context) =
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/usage/statistics";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.MaxResults != null && { maxResults: input.MaxResults }),
@@ -1266,16 +888,7 @@ const serializeAws_restJson1InviteMembersCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/member/invite";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -1297,10 +910,10 @@ const serializeAws_restJson1ListDetectorsCommand = 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 || ""}` + "/detector";
-    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,
@@ -1318,20 +931,11 @@ const serializeAws_restJson1ListFiltersCommand = 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 || ""}` + "/detector/{DetectorId}/filter";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1351,16 +955,7 @@ const serializeAws_restJson1ListFindingsCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/findings";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.FindingCriteria != null && {
@@ -1387,10 +982,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 || ""}` + "/invitation";
-    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,
@@ -1408,20 +1003,11 @@ const serializeAws_restJson1ListIPSetsCommand = 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 || ""}` + "/detector/{DetectorId}/ipset";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1439,21 +1025,12 @@ const serializeAws_restJson1ListMembersCommand = 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 || ""}` + "/detector/{DetectorId}/member";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-        ...(input.OnlyAssociated !== undefined && { onlyAssociated: input.OnlyAssociated }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    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,
@@ -1471,10 +1048,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,
@@ -1493,20 +1070,11 @@ const serializeAws_restJson1ListPublishingDestinationsCommand = async (input, co
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/publishingDestination";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1524,16 +1092,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,
@@ -1550,20 +1109,11 @@ const serializeAws_restJson1ListThreatIntelSetsCommand = 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 || ""}` + "/detector/{DetectorId}/threatintelset";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1583,16 +1133,7 @@ const serializeAws_restJson1StartMonitoringMembersCommand = async (input, contex
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/member/start";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -1614,16 +1155,7 @@ const serializeAws_restJson1StopMonitoringMembersCommand = async (input, context
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/member/stop";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -1645,16 +1177,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) }),
@@ -1676,16 +1199,7 @@ const serializeAws_restJson1UnarchiveFindingsCommand = async (input, context) =>
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/findings/unarchive";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.FindingIds != null && { findingIds: serializeAws_restJson1FindingIds(input.FindingIds, context) }),
@@ -1705,19 +1219,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,
@@ -1737,16 +1242,7 @@ const serializeAws_restJson1UpdateDetectorCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.DataSources != null && {
@@ -1773,26 +1269,8 @@ const serializeAws_restJson1UpdateFilterCommand = async (input, context) => {
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/filter/{FilterName}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.FilterName !== undefined) {
-        const labelValue = input.FilterName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: FilterName.");
-        }
-        resolvedPath = resolvedPath.replace("{FilterName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: FilterName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "FilterName", () => input.FilterName, "{FilterName}", false);
     let body;
     body = JSON.stringify({
         ...(input.Action != null && { action: input.Action }),
@@ -1819,16 +1297,7 @@ const serializeAws_restJson1UpdateFindingsFeedbackCommand = async (input, contex
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/findings/feedback";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Comments != null && { comments: input.Comments }),
@@ -1852,26 +1321,8 @@ const serializeAws_restJson1UpdateIPSetCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/ipset/{IpSetId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.IpSetId !== undefined) {
-        const labelValue = input.IpSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: IpSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{IpSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: IpSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "IpSetId", () => input.IpSetId, "{IpSetId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Activate != null && { activate: input.Activate }),
@@ -1896,16 +1347,7 @@ const serializeAws_restJson1UpdateMalwareScanSettingsCommand = async (input, con
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/malware-scan-settings";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.EbsSnapshotPreservation != null && { ebsSnapshotPreservation: input.EbsSnapshotPreservation }),
@@ -1931,16 +1373,7 @@ const serializeAws_restJson1UpdateMemberDetectorsCommand = async (input, context
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/member/detector/update";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccountIds != null && { accountIds: serializeAws_restJson1AccountIds(input.AccountIds, context) }),
@@ -1965,16 +1398,7 @@ const serializeAws_restJson1UpdateOrganizationConfigurationCommand = async (inpu
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/detector/{DetectorId}/admin";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
     let body;
     body = JSON.stringify({
         ...(input.AutoEnable != null && { autoEnable: input.AutoEnable }),
@@ -2000,26 +1424,8 @@ const serializeAws_restJson1UpdatePublishingDestinationCommand = async (input, c
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/publishingDestination/{DestinationId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.DestinationId !== undefined) {
-        const labelValue = input.DestinationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DestinationId.");
-        }
-        resolvedPath = resolvedPath.replace("{DestinationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DestinationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DestinationId", () => input.DestinationId, "{DestinationId}", false);
     let body;
     body = JSON.stringify({
         ...(input.DestinationProperties != null && {
@@ -2044,26 +1450,8 @@ const serializeAws_restJson1UpdateThreatIntelSetCommand = async (input, context)
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/detector/{DetectorId}/threatintelset/{ThreatIntelSetId}";
-    if (input.DetectorId !== undefined) {
-        const labelValue = input.DetectorId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DetectorId.");
-        }
-        resolvedPath = resolvedPath.replace("{DetectorId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DetectorId.");
-    }
-    if (input.ThreatIntelSetId !== undefined) {
-        const labelValue = input.ThreatIntelSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: ThreatIntelSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{ThreatIntelSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: ThreatIntelSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DetectorId", () => input.DetectorId, "{DetectorId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ThreatIntelSetId", () => input.ThreatIntelSetId, "{ThreatIntelSetId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Activate != null && { activate: input.Activate }),
@@ -2085,11 +1473,11 @@ const deserializeAws_restJson1AcceptAdministratorInvitationCommand = async (outp
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1AcceptAdministratorInvitationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1AcceptAdministratorInvitationCommand = deserializeAws_restJson1AcceptAdministratorInvitationCommand;
 const deserializeAws_restJson1AcceptAdministratorInvitationCommandError = async (output, context) => {
@@ -2097,7 +1485,6 @@ const deserializeAws_restJson1AcceptAdministratorInvitationCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2108,25 +1495,23 @@ const deserializeAws_restJson1AcceptAdministratorInvitationCommandError = async
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 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) => {
@@ -2134,7 +1519,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 "BadRequestException":
@@ -2145,25 +1529,23 @@ const deserializeAws_restJson1AcceptInvitationCommandError = async (output, cont
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ArchiveFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ArchiveFindingsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ArchiveFindingsCommand = deserializeAws_restJson1ArchiveFindingsCommand;
 const deserializeAws_restJson1ArchiveFindingsCommandError = async (output, context) => {
@@ -2171,7 +1553,6 @@ const deserializeAws_restJson1ArchiveFindingsCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2182,29 +1563,26 @@ const deserializeAws_restJson1ArchiveFindingsCommandError = async (output, conte
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateDetectorCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateDetectorCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DetectorId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.detectorId !== undefined && data.detectorId !== null) {
+    if (data.detectorId != null) {
         contents.DetectorId = (0, smithy_client_1.expectString)(data.detectorId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateDetectorCommand = deserializeAws_restJson1CreateDetectorCommand;
 const deserializeAws_restJson1CreateDetectorCommandError = async (output, context) => {
@@ -2212,7 +1590,6 @@ const deserializeAws_restJson1CreateDetectorCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2223,29 +1600,26 @@ const deserializeAws_restJson1CreateDetectorCommandError = async (output, contex
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateFilterCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Name: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.name);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateFilterCommand = deserializeAws_restJson1CreateFilterCommand;
 const deserializeAws_restJson1CreateFilterCommandError = async (output, context) => {
@@ -2253,7 +1627,6 @@ const deserializeAws_restJson1CreateFilterCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2264,29 +1637,26 @@ const deserializeAws_restJson1CreateFilterCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateIPSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateIPSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        IpSetId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ipSetId !== undefined && data.ipSetId !== null) {
+    if (data.ipSetId != null) {
         contents.IpSetId = (0, smithy_client_1.expectString)(data.ipSetId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateIPSetCommand = deserializeAws_restJson1CreateIPSetCommand;
 const deserializeAws_restJson1CreateIPSetCommandError = async (output, context) => {
@@ -2294,7 +1664,6 @@ const deserializeAws_restJson1CreateIPSetCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2305,29 +1674,26 @@ const deserializeAws_restJson1CreateIPSetCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateMembersCommandError(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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateMembersCommand = deserializeAws_restJson1CreateMembersCommand;
 const deserializeAws_restJson1CreateMembersCommandError = async (output, context) => {
@@ -2335,7 +1701,6 @@ const deserializeAws_restJson1CreateMembersCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2346,29 +1711,26 @@ const deserializeAws_restJson1CreateMembersCommandError = async (output, context
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreatePublishingDestinationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreatePublishingDestinationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DestinationId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.destinationId !== undefined && data.destinationId !== null) {
+    if (data.destinationId != null) {
         contents.DestinationId = (0, smithy_client_1.expectString)(data.destinationId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreatePublishingDestinationCommand = deserializeAws_restJson1CreatePublishingDestinationCommand;
 const deserializeAws_restJson1CreatePublishingDestinationCommandError = async (output, context) => {
@@ -2376,7 +1738,6 @@ const deserializeAws_restJson1CreatePublishingDestinationCommandError = async (o
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2387,25 +1748,23 @@ const deserializeAws_restJson1CreatePublishingDestinationCommandError = async (o
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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) => {
@@ -2413,7 +1772,6 @@ const deserializeAws_restJson1CreateSampleFindingsCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2424,29 +1782,26 @@ const deserializeAws_restJson1CreateSampleFindingsCommandError = async (output,
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateThreatIntelSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateThreatIntelSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ThreatIntelSetId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.threatIntelSetId !== undefined && data.threatIntelSetId !== null) {
+    if (data.threatIntelSetId != null) {
         contents.ThreatIntelSetId = (0, smithy_client_1.expectString)(data.threatIntelSetId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateThreatIntelSetCommand = deserializeAws_restJson1CreateThreatIntelSetCommand;
 const deserializeAws_restJson1CreateThreatIntelSetCommandError = async (output, context) => {
@@ -2454,7 +1809,6 @@ const deserializeAws_restJson1CreateThreatIntelSetCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2465,29 +1819,26 @@ const deserializeAws_restJson1CreateThreatIntelSetCommandError = async (output,
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeclineInvitationsCommand = deserializeAws_restJson1DeclineInvitationsCommand;
 const deserializeAws_restJson1DeclineInvitationsCommandError = async (output, context) => {
@@ -2495,7 +1846,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 "BadRequestException":
@@ -2506,25 +1856,23 @@ const deserializeAws_restJson1DeclineInvitationsCommandError = async (output, co
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteDetectorCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteDetectorCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteDetectorCommand = deserializeAws_restJson1DeleteDetectorCommand;
 const deserializeAws_restJson1DeleteDetectorCommandError = async (output, context) => {
@@ -2532,7 +1880,6 @@ const deserializeAws_restJson1DeleteDetectorCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2543,25 +1890,23 @@ const deserializeAws_restJson1DeleteDetectorCommandError = async (output, contex
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteFilterCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteFilterCommand = deserializeAws_restJson1DeleteFilterCommand;
 const deserializeAws_restJson1DeleteFilterCommandError = async (output, context) => {
@@ -2569,7 +1914,6 @@ const deserializeAws_restJson1DeleteFilterCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2580,29 +1924,26 @@ const deserializeAws_restJson1DeleteFilterCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteInvitationsCommand = deserializeAws_restJson1DeleteInvitationsCommand;
 const deserializeAws_restJson1DeleteInvitationsCommandError = async (output, context) => {
@@ -2610,7 +1951,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 "BadRequestException":
@@ -2621,25 +1961,23 @@ const deserializeAws_restJson1DeleteInvitationsCommandError = async (output, con
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteIPSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteIPSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteIPSetCommand = deserializeAws_restJson1DeleteIPSetCommand;
 const deserializeAws_restJson1DeleteIPSetCommandError = async (output, context) => {
@@ -2647,7 +1985,6 @@ const deserializeAws_restJson1DeleteIPSetCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2658,29 +1995,26 @@ const deserializeAws_restJson1DeleteIPSetCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteMembersCommandError(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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteMembersCommand = deserializeAws_restJson1DeleteMembersCommand;
 const deserializeAws_restJson1DeleteMembersCommandError = async (output, context) => {
@@ -2688,7 +2022,6 @@ const deserializeAws_restJson1DeleteMembersCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2699,25 +2032,23 @@ const deserializeAws_restJson1DeleteMembersCommandError = async (output, context
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeletePublishingDestinationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeletePublishingDestinationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeletePublishingDestinationCommand = deserializeAws_restJson1DeletePublishingDestinationCommand;
 const deserializeAws_restJson1DeletePublishingDestinationCommandError = async (output, context) => {
@@ -2725,7 +2056,6 @@ const deserializeAws_restJson1DeletePublishingDestinationCommandError = async (o
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2736,25 +2066,23 @@ const deserializeAws_restJson1DeletePublishingDestinationCommandError = async (o
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteThreatIntelSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteThreatIntelSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteThreatIntelSetCommand = deserializeAws_restJson1DeleteThreatIntelSetCommand;
 const deserializeAws_restJson1DeleteThreatIntelSetCommandError = async (output, context) => {
@@ -2762,7 +2090,6 @@ const deserializeAws_restJson1DeleteThreatIntelSetCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2773,33 +2100,29 @@ const deserializeAws_restJson1DeleteThreatIntelSetCommandError = async (output,
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeMalwareScansCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeMalwareScansCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        NextToken: undefined,
-        Scans: 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.scans !== undefined && data.scans !== null) {
+    if (data.scans != null) {
         contents.Scans = deserializeAws_restJson1Scans(data.scans, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeMalwareScansCommand = deserializeAws_restJson1DescribeMalwareScansCommand;
 const deserializeAws_restJson1DescribeMalwareScansCommandError = async (output, context) => {
@@ -2807,7 +2130,6 @@ const deserializeAws_restJson1DescribeMalwareScansCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2818,37 +2140,32 @@ const deserializeAws_restJson1DescribeMalwareScansCommandError = async (output,
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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,
-        DataSources: undefined,
-        MemberAccountLimitReached: 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.dataSources !== undefined && data.dataSources !== null) {
+    if (data.dataSources != null) {
         contents.DataSources = deserializeAws_restJson1OrganizationDataSourceConfigurationsResult(data.dataSources, context);
     }
-    if (data.memberAccountLimitReached !== undefined && data.memberAccountLimitReached !== null) {
+    if (data.memberAccountLimitReached != null) {
         contents.MemberAccountLimitReached = (0, smithy_client_1.expectBoolean)(data.memberAccountLimitReached);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeOrganizationConfigurationCommand = deserializeAws_restJson1DescribeOrganizationConfigurationCommand;
 const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = async (output, context) => {
@@ -2856,7 +2173,6 @@ const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = as
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2867,45 +2183,38 @@ const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = as
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribePublishingDestinationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribePublishingDestinationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DestinationId: undefined,
-        DestinationProperties: undefined,
-        DestinationType: undefined,
-        PublishingFailureStartTimestamp: undefined,
-        Status: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.destinationId !== undefined && data.destinationId !== null) {
+    if (data.destinationId != null) {
         contents.DestinationId = (0, smithy_client_1.expectString)(data.destinationId);
     }
-    if (data.destinationProperties !== undefined && data.destinationProperties !== null) {
+    if (data.destinationProperties != null) {
         contents.DestinationProperties = deserializeAws_restJson1DestinationProperties(data.destinationProperties, context);
     }
-    if (data.destinationType !== undefined && data.destinationType !== null) {
+    if (data.destinationType != null) {
         contents.DestinationType = (0, smithy_client_1.expectString)(data.destinationType);
     }
-    if (data.publishingFailureStartTimestamp !== undefined && data.publishingFailureStartTimestamp !== null) {
+    if (data.publishingFailureStartTimestamp != null) {
         contents.PublishingFailureStartTimestamp = (0, smithy_client_1.expectLong)(data.publishingFailureStartTimestamp);
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.Status = (0, smithy_client_1.expectString)(data.status);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribePublishingDestinationCommand = deserializeAws_restJson1DescribePublishingDestinationCommand;
 const deserializeAws_restJson1DescribePublishingDestinationCommandError = async (output, context) => {
@@ -2913,7 +2222,6 @@ const deserializeAws_restJson1DescribePublishingDestinationCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2924,25 +2232,23 @@ const deserializeAws_restJson1DescribePublishingDestinationCommandError = async
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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) => {
@@ -2950,7 +2256,6 @@ const deserializeAws_restJson1DisableOrganizationAdminAccountCommandError = asyn
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2961,25 +2266,23 @@ const deserializeAws_restJson1DisableOrganizationAdminAccountCommandError = asyn
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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) => {
@@ -2987,7 +2290,6 @@ const deserializeAws_restJson1DisassociateFromAdministratorAccountCommandError =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -2998,25 +2300,23 @@ const deserializeAws_restJson1DisassociateFromAdministratorAccountCommandError =
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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) => {
@@ -3024,7 +2324,6 @@ const deserializeAws_restJson1DisassociateFromMasterAccountCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3035,29 +2334,26 @@ const deserializeAws_restJson1DisassociateFromMasterAccountCommandError = async
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisassociateMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisassociateMembersCommandError(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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisassociateMembersCommand = deserializeAws_restJson1DisassociateMembersCommand;
 const deserializeAws_restJson1DisassociateMembersCommandError = async (output, context) => {
@@ -3065,7 +2361,6 @@ const deserializeAws_restJson1DisassociateMembersCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3076,25 +2371,23 @@ const deserializeAws_restJson1DisassociateMembersCommandError = async (output, c
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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) => {
@@ -3102,7 +2395,6 @@ const deserializeAws_restJson1EnableOrganizationAdminAccountCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3113,29 +2405,26 @@ const deserializeAws_restJson1EnableOrganizationAdminAccountCommandError = async
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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_restJson1Administrator(data.administrator, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetAdministratorAccountCommand = deserializeAws_restJson1GetAdministratorAccountCommand;
 const deserializeAws_restJson1GetAdministratorAccountCommandError = async (output, context) => {
@@ -3143,7 +2432,6 @@ const deserializeAws_restJson1GetAdministratorAccountCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3154,53 +2442,44 @@ const deserializeAws_restJson1GetAdministratorAccountCommandError = async (outpu
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetDetectorCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetDetectorCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        CreatedAt: undefined,
-        DataSources: undefined,
-        FindingPublishingFrequency: undefined,
-        ServiceRole: undefined,
-        Status: 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.createdAt !== undefined && data.createdAt !== null) {
+    if (data.createdAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectString)(data.createdAt);
     }
-    if (data.dataSources !== undefined && data.dataSources !== null) {
+    if (data.dataSources != null) {
         contents.DataSources = deserializeAws_restJson1DataSourceConfigurationsResult(data.dataSources, context);
     }
-    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.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.expectString)(data.updatedAt);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetDetectorCommand = deserializeAws_restJson1GetDetectorCommand;
 const deserializeAws_restJson1GetDetectorCommandError = async (output, context) => {
@@ -3208,7 +2487,6 @@ const deserializeAws_restJson1GetDetectorCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3219,49 +2497,41 @@ const deserializeAws_restJson1GetDetectorCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetFilterCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Action: undefined,
-        Description: undefined,
-        FindingCriteria: undefined,
-        Name: undefined,
-        Rank: 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.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.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.name);
     }
-    if (data.rank !== undefined && data.rank !== null) {
+    if (data.rank != null) {
         contents.Rank = (0, smithy_client_1.expectInt32)(data.rank);
     }
-    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_restJson1GetFilterCommand = deserializeAws_restJson1GetFilterCommand;
 const deserializeAws_restJson1GetFilterCommandError = async (output, context) => {
@@ -3269,7 +2539,6 @@ const deserializeAws_restJson1GetFilterCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3280,29 +2549,26 @@ const deserializeAws_restJson1GetFilterCommandError = async (output, context) =>
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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_restJson1Findings(data.findings, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetFindingsCommand = deserializeAws_restJson1GetFindingsCommand;
 const deserializeAws_restJson1GetFindingsCommandError = async (output, context) => {
@@ -3310,7 +2576,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 "BadRequestException":
@@ -3321,29 +2586,26 @@ const deserializeAws_restJson1GetFindingsCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetFindingsStatisticsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetFindingsStatisticsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        FindingStatistics: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.findingStatistics !== undefined && data.findingStatistics !== null) {
+    if (data.findingStatistics != null) {
         contents.FindingStatistics = deserializeAws_restJson1FindingStatistics(data.findingStatistics, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetFindingsStatisticsCommand = deserializeAws_restJson1GetFindingsStatisticsCommand;
 const deserializeAws_restJson1GetFindingsStatisticsCommandError = async (output, context) => {
@@ -3351,7 +2613,6 @@ const deserializeAws_restJson1GetFindingsStatisticsCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3362,29 +2623,26 @@ const deserializeAws_restJson1GetFindingsStatisticsCommandError = async (output,
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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.expectInt32)(data.invitationsCount);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetInvitationsCountCommand = deserializeAws_restJson1GetInvitationsCountCommand;
 const deserializeAws_restJson1GetInvitationsCountCommandError = async (output, context) => {
@@ -3392,7 +2650,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 "BadRequestException":
@@ -3403,45 +2660,38 @@ const deserializeAws_restJson1GetInvitationsCountCommandError = async (output, c
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetIPSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetIPSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Format: undefined,
-        Location: undefined,
-        Name: undefined,
-        Status: undefined,
-        Tags: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.format !== undefined && data.format !== null) {
+    if (data.format != null) {
         contents.Format = (0, smithy_client_1.expectString)(data.format);
     }
-    if (data.location !== undefined && data.location !== null) {
+    if (data.location != null) {
         contents.Location = (0, smithy_client_1.expectString)(data.location);
     }
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.name);
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.Status = (0, smithy_client_1.expectString)(data.status);
     }
-    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_restJson1GetIPSetCommand = deserializeAws_restJson1GetIPSetCommand;
 const deserializeAws_restJson1GetIPSetCommandError = async (output, context) => {
@@ -3449,7 +2699,6 @@ const deserializeAws_restJson1GetIPSetCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3460,33 +2709,29 @@ const deserializeAws_restJson1GetIPSetCommandError = async (output, context) =>
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetMalwareScanSettingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetMalwareScanSettingsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        EbsSnapshotPreservation: undefined,
-        ScanResourceCriteria: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ebsSnapshotPreservation !== undefined && data.ebsSnapshotPreservation !== null) {
+    if (data.ebsSnapshotPreservation != null) {
         contents.EbsSnapshotPreservation = (0, smithy_client_1.expectString)(data.ebsSnapshotPreservation);
     }
-    if (data.scanResourceCriteria !== undefined && data.scanResourceCriteria !== null) {
+    if (data.scanResourceCriteria != null) {
         contents.ScanResourceCriteria = deserializeAws_restJson1ScanResourceCriteria(data.scanResourceCriteria, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetMalwareScanSettingsCommand = deserializeAws_restJson1GetMalwareScanSettingsCommand;
 const deserializeAws_restJson1GetMalwareScanSettingsCommandError = async (output, context) => {
@@ -3494,7 +2739,6 @@ const deserializeAws_restJson1GetMalwareScanSettingsCommandError = async (output
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3505,29 +2749,26 @@ const deserializeAws_restJson1GetMalwareScanSettingsCommandError = async (output
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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_restJson1Master(data.master, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetMasterAccountCommand = deserializeAws_restJson1GetMasterAccountCommand;
 const deserializeAws_restJson1GetMasterAccountCommandError = async (output, context) => {
@@ -3535,7 +2776,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 "BadRequestException":
@@ -3546,33 +2786,29 @@ const deserializeAws_restJson1GetMasterAccountCommandError = async (output, cont
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetMemberDetectorsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetMemberDetectorsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        MemberDataSourceConfigurations: undefined,
-        UnprocessedAccounts: 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.MemberDataSourceConfigurations = deserializeAws_restJson1MemberDataSourceConfigurations(data.members, context);
     }
-    if (data.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+    if (data.unprocessedAccounts != null) {
         contents.UnprocessedAccounts = deserializeAws_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetMemberDetectorsCommand = deserializeAws_restJson1GetMemberDetectorsCommand;
 const deserializeAws_restJson1GetMemberDetectorsCommandError = async (output, context) => {
@@ -3580,7 +2816,6 @@ const deserializeAws_restJson1GetMemberDetectorsCommandError = async (output, co
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3591,33 +2826,29 @@ const deserializeAws_restJson1GetMemberDetectorsCommandError = async (output, co
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetMembersCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Members: undefined,
-        UnprocessedAccounts: 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_restJson1Members(data.members, context);
     }
-    if (data.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+    if (data.unprocessedAccounts != null) {
         contents.UnprocessedAccounts = deserializeAws_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetMembersCommand = deserializeAws_restJson1GetMembersCommand;
 const deserializeAws_restJson1GetMembersCommandError = async (output, context) => {
@@ -3625,7 +2856,6 @@ const deserializeAws_restJson1GetMembersCommandError = async (output, context) =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3636,33 +2866,29 @@ const deserializeAws_restJson1GetMembersCommandError = async (output, context) =
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetRemainingFreeTrialDaysCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetRemainingFreeTrialDaysCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Accounts: undefined,
-        UnprocessedAccounts: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.accounts !== undefined && data.accounts !== null) {
+    if (data.accounts != null) {
         contents.Accounts = deserializeAws_restJson1AccountFreeTrialInfos(data.accounts, context);
     }
-    if (data.unprocessedAccounts !== undefined && data.unprocessedAccounts !== null) {
+    if (data.unprocessedAccounts != null) {
         contents.UnprocessedAccounts = deserializeAws_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetRemainingFreeTrialDaysCommand = deserializeAws_restJson1GetRemainingFreeTrialDaysCommand;
 const deserializeAws_restJson1GetRemainingFreeTrialDaysCommandError = async (output, context) => {
@@ -3670,7 +2896,6 @@ const deserializeAws_restJson1GetRemainingFreeTrialDaysCommandError = async (out
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3681,45 +2906,38 @@ const deserializeAws_restJson1GetRemainingFreeTrialDaysCommandError = async (out
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetThreatIntelSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetThreatIntelSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Format: undefined,
-        Location: undefined,
-        Name: undefined,
-        Status: undefined,
-        Tags: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.format !== undefined && data.format !== null) {
+    if (data.format != null) {
         contents.Format = (0, smithy_client_1.expectString)(data.format);
     }
-    if (data.location !== undefined && data.location !== null) {
+    if (data.location != null) {
         contents.Location = (0, smithy_client_1.expectString)(data.location);
     }
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.name);
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.Status = (0, smithy_client_1.expectString)(data.status);
     }
-    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_restJson1GetThreatIntelSetCommand = deserializeAws_restJson1GetThreatIntelSetCommand;
 const deserializeAws_restJson1GetThreatIntelSetCommandError = async (output, context) => {
@@ -3727,7 +2945,6 @@ const deserializeAws_restJson1GetThreatIntelSetCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3738,33 +2955,29 @@ const deserializeAws_restJson1GetThreatIntelSetCommandError = async (output, con
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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,
-        UsageStatistics: 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.usageStatistics !== undefined && data.usageStatistics !== null) {
+    if (data.usageStatistics != null) {
         contents.UsageStatistics = deserializeAws_restJson1UsageStatistics(data.usageStatistics, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetUsageStatisticsCommand = deserializeAws_restJson1GetUsageStatisticsCommand;
 const deserializeAws_restJson1GetUsageStatisticsCommandError = async (output, context) => {
@@ -3772,7 +2985,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 "BadRequestException":
@@ -3783,29 +2995,26 @@ const deserializeAws_restJson1GetUsageStatisticsCommandError = async (output, co
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1InviteMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1InviteMembersCommandError(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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1InviteMembersCommand = deserializeAws_restJson1InviteMembersCommand;
 const deserializeAws_restJson1InviteMembersCommandError = async (output, context) => {
@@ -3813,7 +3022,6 @@ const deserializeAws_restJson1InviteMembersCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3824,33 +3032,29 @@ const deserializeAws_restJson1InviteMembersCommandError = async (output, context
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListDetectorsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListDetectorsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DetectorIds: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.detectorIds !== undefined && data.detectorIds !== null) {
+    if (data.detectorIds != null) {
         contents.DetectorIds = deserializeAws_restJson1DetectorIds(data.detectorIds, 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_restJson1ListDetectorsCommand = deserializeAws_restJson1ListDetectorsCommand;
 const deserializeAws_restJson1ListDetectorsCommandError = async (output, context) => {
@@ -3858,7 +3062,6 @@ const deserializeAws_restJson1ListDetectorsCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3869,33 +3072,29 @@ const deserializeAws_restJson1ListDetectorsCommandError = async (output, context
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListFiltersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListFiltersCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        FilterNames: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.filterNames !== undefined && data.filterNames !== null) {
+    if (data.filterNames != null) {
         contents.FilterNames = deserializeAws_restJson1FilterNames(data.filterNames, 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_restJson1ListFiltersCommand = deserializeAws_restJson1ListFiltersCommand;
 const deserializeAws_restJson1ListFiltersCommandError = async (output, context) => {
@@ -3903,7 +3102,6 @@ const deserializeAws_restJson1ListFiltersCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -3914,33 +3112,29 @@ const deserializeAws_restJson1ListFiltersCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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_restJson1FindingIds(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) => {
@@ -3948,7 +3142,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 "BadRequestException":
@@ -3959,33 +3152,29 @@ const deserializeAws_restJson1ListFindingsCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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_restJson1Invitations(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) => {
@@ -3993,7 +3182,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 "BadRequestException":
@@ -4004,33 +3192,29 @@ const deserializeAws_restJson1ListInvitationsCommandError = async (output, conte
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListIPSetsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListIPSetsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        IpSetIds: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ipSetIds !== undefined && data.ipSetIds !== null) {
+    if (data.ipSetIds != null) {
         contents.IpSetIds = deserializeAws_restJson1IpSetIds(data.ipSetIds, 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_restJson1ListIPSetsCommand = deserializeAws_restJson1ListIPSetsCommand;
 const deserializeAws_restJson1ListIPSetsCommandError = async (output, context) => {
@@ -4038,7 +3222,6 @@ const deserializeAws_restJson1ListIPSetsCommandError = async (output, context) =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4049,33 +3232,29 @@ const deserializeAws_restJson1ListIPSetsCommandError = async (output, context) =
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 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_restJson1Members(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) => {
@@ -4083,7 +3262,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 "BadRequestException":
@@ -4094,33 +3272,29 @@ const deserializeAws_restJson1ListMembersCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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_restJson1AdminAccounts(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) => {
@@ -4128,7 +3302,6 @@ const deserializeAws_restJson1ListOrganizationAdminAccountsCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4139,33 +3312,29 @@ const deserializeAws_restJson1ListOrganizationAdminAccountsCommandError = async
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListPublishingDestinationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListPublishingDestinationsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Destinations: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.destinations !== undefined && data.destinations !== null) {
+    if (data.destinations != null) {
         contents.Destinations = deserializeAws_restJson1Destinations(data.destinations, 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_restJson1ListPublishingDestinationsCommand = deserializeAws_restJson1ListPublishingDestinationsCommand;
 const deserializeAws_restJson1ListPublishingDestinationsCommandError = async (output, context) => {
@@ -4173,7 +3342,6 @@ const deserializeAws_restJson1ListPublishingDestinationsCommandError = async (ou
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4184,29 +3352,26 @@ const deserializeAws_restJson1ListPublishingDestinationsCommandError = async (ou
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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) => {
@@ -4214,7 +3379,6 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4225,33 +3389,29 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListThreatIntelSetsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListThreatIntelSetsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        NextToken: undefined,
-        ThreatIntelSetIds: 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.threatIntelSetIds !== undefined && data.threatIntelSetIds !== null) {
+    if (data.threatIntelSetIds != null) {
         contents.ThreatIntelSetIds = deserializeAws_restJson1ThreatIntelSetIds(data.threatIntelSetIds, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListThreatIntelSetsCommand = deserializeAws_restJson1ListThreatIntelSetsCommand;
 const deserializeAws_restJson1ListThreatIntelSetsCommandError = async (output, context) => {
@@ -4259,7 +3419,6 @@ const deserializeAws_restJson1ListThreatIntelSetsCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4270,29 +3429,26 @@ const deserializeAws_restJson1ListThreatIntelSetsCommandError = async (output, c
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1StartMonitoringMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1StartMonitoringMembersCommandError(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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1StartMonitoringMembersCommand = deserializeAws_restJson1StartMonitoringMembersCommand;
 const deserializeAws_restJson1StartMonitoringMembersCommandError = async (output, context) => {
@@ -4300,7 +3456,6 @@ const deserializeAws_restJson1StartMonitoringMembersCommandError = async (output
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4311,29 +3466,26 @@ const deserializeAws_restJson1StartMonitoringMembersCommandError = async (output
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1StopMonitoringMembersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1StopMonitoringMembersCommandError(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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1StopMonitoringMembersCommand = deserializeAws_restJson1StopMonitoringMembersCommand;
 const deserializeAws_restJson1StopMonitoringMembersCommandError = async (output, context) => {
@@ -4341,7 +3493,6 @@ const deserializeAws_restJson1StopMonitoringMembersCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4352,25 +3503,23 @@ const deserializeAws_restJson1StopMonitoringMembersCommandError = async (output,
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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,7 +3527,6 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4389,25 +3537,23 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UnarchiveFindingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UnarchiveFindingsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UnarchiveFindingsCommand = deserializeAws_restJson1UnarchiveFindingsCommand;
 const deserializeAws_restJson1UnarchiveFindingsCommandError = async (output, context) => {
@@ -4415,7 +3561,6 @@ const deserializeAws_restJson1UnarchiveFindingsCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4426,25 +3571,23 @@ const deserializeAws_restJson1UnarchiveFindingsCommandError = async (output, con
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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) => {
@@ -4452,7 +3595,6 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4463,25 +3605,23 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateDetectorCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateDetectorCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateDetectorCommand = deserializeAws_restJson1UpdateDetectorCommand;
 const deserializeAws_restJson1UpdateDetectorCommandError = async (output, context) => {
@@ -4489,7 +3629,6 @@ const deserializeAws_restJson1UpdateDetectorCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4500,29 +3639,26 @@ const deserializeAws_restJson1UpdateDetectorCommandError = async (output, contex
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateFilterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateFilterCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Name: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.name);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateFilterCommand = deserializeAws_restJson1UpdateFilterCommand;
 const deserializeAws_restJson1UpdateFilterCommandError = async (output, context) => {
@@ -4530,7 +3666,6 @@ const deserializeAws_restJson1UpdateFilterCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4541,25 +3676,23 @@ const deserializeAws_restJson1UpdateFilterCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateFindingsFeedbackCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateFindingsFeedbackCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateFindingsFeedbackCommand = deserializeAws_restJson1UpdateFindingsFeedbackCommand;
 const deserializeAws_restJson1UpdateFindingsFeedbackCommandError = async (output, context) => {
@@ -4567,7 +3700,6 @@ const deserializeAws_restJson1UpdateFindingsFeedbackCommandError = async (output
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4578,25 +3710,23 @@ const deserializeAws_restJson1UpdateFindingsFeedbackCommandError = async (output
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateIPSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateIPSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateIPSetCommand = deserializeAws_restJson1UpdateIPSetCommand;
 const deserializeAws_restJson1UpdateIPSetCommandError = async (output, context) => {
@@ -4604,7 +3734,6 @@ const deserializeAws_restJson1UpdateIPSetCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4615,25 +3744,23 @@ const deserializeAws_restJson1UpdateIPSetCommandError = async (output, context)
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateMalwareScanSettingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateMalwareScanSettingsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateMalwareScanSettingsCommand = deserializeAws_restJson1UpdateMalwareScanSettingsCommand;
 const deserializeAws_restJson1UpdateMalwareScanSettingsCommandError = async (output, context) => {
@@ -4641,7 +3768,6 @@ const deserializeAws_restJson1UpdateMalwareScanSettingsCommandError = async (out
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4652,29 +3778,26 @@ const deserializeAws_restJson1UpdateMalwareScanSettingsCommandError = async (out
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateMemberDetectorsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateMemberDetectorsCommandError(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_restJson1UnprocessedAccounts(data.unprocessedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateMemberDetectorsCommand = deserializeAws_restJson1UpdateMemberDetectorsCommand;
 const deserializeAws_restJson1UpdateMemberDetectorsCommandError = async (output, context) => {
@@ -4682,7 +3805,6 @@ const deserializeAws_restJson1UpdateMemberDetectorsCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4693,25 +3815,23 @@ const deserializeAws_restJson1UpdateMemberDetectorsCommandError = async (output,
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                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) => {
@@ -4719,7 +3839,6 @@ const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = asyn
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4730,25 +3849,23 @@ const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = asyn
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdatePublishingDestinationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdatePublishingDestinationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdatePublishingDestinationCommand = deserializeAws_restJson1UpdatePublishingDestinationCommand;
 const deserializeAws_restJson1UpdatePublishingDestinationCommandError = async (output, context) => {
@@ -4756,7 +3873,6 @@ const deserializeAws_restJson1UpdatePublishingDestinationCommandError = async (o
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4767,25 +3883,23 @@ const deserializeAws_restJson1UpdatePublishingDestinationCommandError = async (o
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateThreatIntelSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateThreatIntelSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateThreatIntelSetCommand = deserializeAws_restJson1UpdateThreatIntelSetCommand;
 const deserializeAws_restJson1UpdateThreatIntelSetCommandError = async (output, context) => {
@@ -4793,7 +3907,6 @@ const deserializeAws_restJson1UpdateThreatIntelSetCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BadRequestException":
@@ -4804,23 +3917,22 @@ const deserializeAws_restJson1UpdateThreatIntelSetCommandError = async (output,
             throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new GuardDutyServiceException_1.GuardDutyServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: GuardDutyServiceException_1.GuardDutyServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
+const map = smithy_client_1.map;
 const deserializeAws_restJson1BadRequestExceptionResponse = 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);
     }
-    if (data.__type !== undefined && data.__type !== null) {
+    if (data.__type != null) {
         contents.Type = (0, smithy_client_1.expectString)(data.__type);
     }
     const exception = new models_0_1.BadRequestException({
@@ -4830,12 +3942,12 @@ const deserializeAws_restJson1BadRequestExceptionResponse = async (parsedOutput,
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalServerErrorExceptionResponse = 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);
     }
-    if (data.__type !== undefined && data.__type !== null) {
+    if (data.__type != null) {
         contents.Type = (0, smithy_client_1.expectString)(data.__type);
     }
     const exception = new models_0_1.InternalServerErrorException({
@@ -4854,9 +3966,6 @@ const serializeAws_restJson1AccountDetails = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AccountDetail(entry, context);
     });
 };
@@ -4864,9 +3973,6 @@ const serializeAws_restJson1AccountIds = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4912,9 +4018,6 @@ const serializeAws_restJson1DataSourceList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4928,9 +4031,6 @@ const serializeAws_restJson1Eq = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4938,9 +4038,6 @@ const serializeAws_restJson1Equals = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4970,9 +4067,6 @@ const serializeAws_restJson1FilterCriterionList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1FilterCriterion(entry, context);
     });
 };
@@ -4985,9 +4079,6 @@ const serializeAws_restJson1FindingIds = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4995,9 +4086,6 @@ const serializeAws_restJson1FindingStatisticTypes = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -5005,9 +4093,6 @@ const serializeAws_restJson1FindingTypes = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -5034,9 +4119,6 @@ const serializeAws_restJson1MapEquals = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1ScanConditionPair(entry, context);
     });
 };
@@ -5044,9 +4126,6 @@ const serializeAws_restJson1Neq = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -5054,9 +4133,6 @@ const serializeAws_restJson1NotEquals = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -5113,9 +4189,6 @@ const serializeAws_restJson1ResourceList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };