@aws-sdk/client-inspector2 3.131.0 → 3.142.0

package/dist-cjs/protocols/Aws_restJson1.js

@@ -584,16 +584,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,
@@ -637,16 +628,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) }),
@@ -666,19 +648,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,
@@ -768,15 +741,14 @@ const deserializeAws_restJson1AssociateMemberCommand = async (output, context) =
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1AssociateMemberCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        accountId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.accountId !== undefined && data.accountId !== null) {
+    if (data.accountId != null) {
         contents.accountId = (0, smithy_client_1.expectString)(data.accountId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1AssociateMemberCommand = deserializeAws_restJson1AssociateMemberCommand;
 const deserializeAws_restJson1AssociateMemberCommandError = async (output, context) => {
@@ -784,7 +756,6 @@ const deserializeAws_restJson1AssociateMemberCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -801,33 +772,29 @@ const deserializeAws_restJson1AssociateMemberCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1BatchGetAccountStatusCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1BatchGetAccountStatusCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        accounts: undefined,
-        failedAccounts: 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_restJson1AccountStateList(data.accounts, context);
     }
-    if (data.failedAccounts !== undefined && data.failedAccounts !== null) {
+    if (data.failedAccounts != null) {
         contents.failedAccounts = deserializeAws_restJson1FailedAccountList(data.failedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1BatchGetAccountStatusCommand = deserializeAws_restJson1BatchGetAccountStatusCommand;
 const deserializeAws_restJson1BatchGetAccountStatusCommandError = async (output, context) => {
@@ -835,7 +802,6 @@ const deserializeAws_restJson1BatchGetAccountStatusCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -855,33 +821,29 @@ const deserializeAws_restJson1BatchGetAccountStatusCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1BatchGetFreeTrialInfoCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1BatchGetFreeTrialInfoCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        accounts: undefined,
-        failedAccounts: 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_restJson1FreeTrialAccountInfoList(data.accounts, context);
     }
-    if (data.failedAccounts !== undefined && data.failedAccounts !== null) {
+    if (data.failedAccounts != null) {
         contents.failedAccounts = deserializeAws_restJson1FreeTrialInfoErrorList(data.failedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1BatchGetFreeTrialInfoCommand = deserializeAws_restJson1BatchGetFreeTrialInfoCommand;
 const deserializeAws_restJson1BatchGetFreeTrialInfoCommandError = async (output, context) => {
@@ -889,7 +851,6 @@ const deserializeAws_restJson1BatchGetFreeTrialInfoCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -906,29 +867,26 @@ const deserializeAws_restJson1BatchGetFreeTrialInfoCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CancelFindingsReportCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CancelFindingsReportCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        reportId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.reportId !== undefined && data.reportId !== null) {
+    if (data.reportId != null) {
         contents.reportId = (0, smithy_client_1.expectString)(data.reportId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CancelFindingsReportCommand = deserializeAws_restJson1CancelFindingsReportCommand;
 const deserializeAws_restJson1CancelFindingsReportCommandError = async (output, context) => {
@@ -936,7 +894,6 @@ const deserializeAws_restJson1CancelFindingsReportCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -956,29 +913,26 @@ const deserializeAws_restJson1CancelFindingsReportCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                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),
-        arn: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateFilterCommand = deserializeAws_restJson1CreateFilterCommand;
 const deserializeAws_restJson1CreateFilterCommandError = async (output, context) => {
@@ -986,7 +940,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 "AccessDeniedException":
@@ -1009,29 +962,26 @@ const deserializeAws_restJson1CreateFilterCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateFindingsReportCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateFindingsReportCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        reportId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.reportId !== undefined && data.reportId !== null) {
+    if (data.reportId != null) {
         contents.reportId = (0, smithy_client_1.expectString)(data.reportId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateFindingsReportCommand = deserializeAws_restJson1CreateFindingsReportCommand;
 const deserializeAws_restJson1CreateFindingsReportCommandError = async (output, context) => {
@@ -1039,7 +989,6 @@ const deserializeAws_restJson1CreateFindingsReportCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1059,29 +1008,26 @@ const deserializeAws_restJson1CreateFindingsReportCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                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),
-        arn: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteFilterCommand = deserializeAws_restJson1DeleteFilterCommand;
 const deserializeAws_restJson1DeleteFilterCommandError = async (output, context) => {
@@ -1089,7 +1035,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 "AccessDeniedException":
@@ -1109,33 +1054,29 @@ const deserializeAws_restJson1DeleteFilterCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeOrganizationConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeOrganizationConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        autoEnable: undefined,
-        maxAccountLimitReached: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.autoEnable !== undefined && data.autoEnable !== null) {
+    if (data.autoEnable != null) {
         contents.autoEnable = deserializeAws_restJson1AutoEnable(data.autoEnable, context);
     }
-    if (data.maxAccountLimitReached !== undefined && data.maxAccountLimitReached !== null) {
+    if (data.maxAccountLimitReached != null) {
         contents.maxAccountLimitReached = (0, smithy_client_1.expectBoolean)(data.maxAccountLimitReached);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeOrganizationConfigurationCommand = deserializeAws_restJson1DescribeOrganizationConfigurationCommand;
 const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = async (output, context) => {
@@ -1143,7 +1084,6 @@ const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = as
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1160,33 +1100,29 @@ const deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = as
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisableCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisableCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        accounts: undefined,
-        failedAccounts: 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_restJson1AccountList(data.accounts, context);
     }
-    if (data.failedAccounts !== undefined && data.failedAccounts !== null) {
+    if (data.failedAccounts != null) {
         contents.failedAccounts = deserializeAws_restJson1FailedAccountList(data.failedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisableCommand = deserializeAws_restJson1DisableCommand;
 const deserializeAws_restJson1DisableCommandError = async (output, context) => {
@@ -1194,7 +1130,6 @@ const deserializeAws_restJson1DisableCommandError = async (output, context) => {
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1214,29 +1149,26 @@ const deserializeAws_restJson1DisableCommandError = async (output, context) => {
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisableDelegatedAdminAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisableDelegatedAdminAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        delegatedAdminAccountId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.delegatedAdminAccountId !== undefined && data.delegatedAdminAccountId !== null) {
+    if (data.delegatedAdminAccountId != null) {
         contents.delegatedAdminAccountId = (0, smithy_client_1.expectString)(data.delegatedAdminAccountId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisableDelegatedAdminAccountCommand = deserializeAws_restJson1DisableDelegatedAdminAccountCommand;
 const deserializeAws_restJson1DisableDelegatedAdminAccountCommandError = async (output, context) => {
@@ -1244,7 +1176,6 @@ const deserializeAws_restJson1DisableDelegatedAdminAccountCommandError = async (
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1267,29 +1198,26 @@ const deserializeAws_restJson1DisableDelegatedAdminAccountCommandError = async (
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DisassociateMemberCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DisassociateMemberCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        accountId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.accountId !== undefined && data.accountId !== null) {
+    if (data.accountId != null) {
         contents.accountId = (0, smithy_client_1.expectString)(data.accountId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DisassociateMemberCommand = deserializeAws_restJson1DisassociateMemberCommand;
 const deserializeAws_restJson1DisassociateMemberCommandError = async (output, context) => {
@@ -1297,7 +1225,6 @@ const deserializeAws_restJson1DisassociateMemberCommandError = async (output, co
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1314,33 +1241,29 @@ const deserializeAws_restJson1DisassociateMemberCommandError = async (output, co
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1EnableCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1EnableCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        accounts: undefined,
-        failedAccounts: 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_restJson1AccountList(data.accounts, context);
     }
-    if (data.failedAccounts !== undefined && data.failedAccounts !== null) {
+    if (data.failedAccounts != null) {
         contents.failedAccounts = deserializeAws_restJson1FailedAccountList(data.failedAccounts, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1EnableCommand = deserializeAws_restJson1EnableCommand;
 const deserializeAws_restJson1EnableCommandError = async (output, context) => {
@@ -1348,7 +1271,6 @@ const deserializeAws_restJson1EnableCommandError = async (output, context) => {
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1368,29 +1290,26 @@ const deserializeAws_restJson1EnableCommandError = async (output, context) => {
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1EnableDelegatedAdminAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1EnableDelegatedAdminAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        delegatedAdminAccountId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.delegatedAdminAccountId !== undefined && data.delegatedAdminAccountId !== null) {
+    if (data.delegatedAdminAccountId != null) {
         contents.delegatedAdminAccountId = (0, smithy_client_1.expectString)(data.delegatedAdminAccountId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1EnableDelegatedAdminAccountCommand = deserializeAws_restJson1EnableDelegatedAdminAccountCommand;
 const deserializeAws_restJson1EnableDelegatedAdminAccountCommandError = async (output, context) => {
@@ -1398,7 +1317,6 @@ const deserializeAws_restJson1EnableDelegatedAdminAccountCommandError = async (o
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1421,29 +1339,26 @@ const deserializeAws_restJson1EnableDelegatedAdminAccountCommandError = async (o
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ecrConfiguration: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ecrConfiguration !== undefined && data.ecrConfiguration !== null) {
+    if (data.ecrConfiguration != null) {
         contents.ecrConfiguration = deserializeAws_restJson1EcrConfigurationState(data.ecrConfiguration, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetConfigurationCommand = deserializeAws_restJson1GetConfigurationCommand;
 const deserializeAws_restJson1GetConfigurationCommandError = async (output, context) => {
@@ -1451,7 +1366,6 @@ const deserializeAws_restJson1GetConfigurationCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1465,29 +1379,26 @@ const deserializeAws_restJson1GetConfigurationCommandError = async (output, cont
             throw await deserializeAws_restJson1ThrottlingExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetDelegatedAdminAccountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetDelegatedAdminAccountCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        delegatedAdmin: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.delegatedAdmin !== undefined && data.delegatedAdmin !== null) {
+    if (data.delegatedAdmin != null) {
         contents.delegatedAdmin = deserializeAws_restJson1DelegatedAdmin(data.delegatedAdmin, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetDelegatedAdminAccountCommand = deserializeAws_restJson1GetDelegatedAdminAccountCommand;
 const deserializeAws_restJson1GetDelegatedAdminAccountCommandError = async (output, context) => {
@@ -1495,7 +1406,6 @@ const deserializeAws_restJson1GetDelegatedAdminAccountCommandError = async (outp
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1515,49 +1425,41 @@ const deserializeAws_restJson1GetDelegatedAdminAccountCommandError = async (outp
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetFindingsReportStatusCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetFindingsReportStatusCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        destination: undefined,
-        errorCode: undefined,
-        errorMessage: undefined,
-        filterCriteria: undefined,
-        reportId: undefined,
-        status: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.destination !== undefined && data.destination !== null) {
+    if (data.destination != null) {
         contents.destination = deserializeAws_restJson1Destination(data.destination, context);
     }
-    if (data.errorCode !== undefined && data.errorCode !== null) {
+    if (data.errorCode != null) {
         contents.errorCode = (0, smithy_client_1.expectString)(data.errorCode);
     }
-    if (data.errorMessage !== undefined && data.errorMessage !== null) {
+    if (data.errorMessage != null) {
         contents.errorMessage = (0, smithy_client_1.expectString)(data.errorMessage);
     }
-    if (data.filterCriteria !== undefined && data.filterCriteria !== null) {
+    if (data.filterCriteria != null) {
         contents.filterCriteria = deserializeAws_restJson1FilterCriteria(data.filterCriteria, context);
     }
-    if (data.reportId !== undefined && data.reportId !== null) {
+    if (data.reportId != null) {
         contents.reportId = (0, smithy_client_1.expectString)(data.reportId);
     }
-    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_restJson1GetFindingsReportStatusCommand = deserializeAws_restJson1GetFindingsReportStatusCommand;
 const deserializeAws_restJson1GetFindingsReportStatusCommandError = async (output, context) => {
@@ -1565,7 +1467,6 @@ const deserializeAws_restJson1GetFindingsReportStatusCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1585,29 +1486,26 @@ const deserializeAws_restJson1GetFindingsReportStatusCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetMemberCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetMemberCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        member: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.member !== undefined && data.member !== null) {
+    if (data.member != null) {
         contents.member = deserializeAws_restJson1Member(data.member, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetMemberCommand = deserializeAws_restJson1GetMemberCommand;
 const deserializeAws_restJson1GetMemberCommandError = async (output, context) => {
@@ -1615,7 +1513,6 @@ const deserializeAws_restJson1GetMemberCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1635,33 +1532,29 @@ const deserializeAws_restJson1GetMemberCommandError = async (output, context) =>
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListAccountPermissionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListAccountPermissionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        nextToken: undefined,
-        permissions: 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.permissions !== undefined && data.permissions !== null) {
+    if (data.permissions != null) {
         contents.permissions = deserializeAws_restJson1Permissions(data.permissions, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListAccountPermissionsCommand = deserializeAws_restJson1ListAccountPermissionsCommand;
 const deserializeAws_restJson1ListAccountPermissionsCommandError = async (output, context) => {
@@ -1669,7 +1562,6 @@ const deserializeAws_restJson1ListAccountPermissionsCommandError = async (output
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1686,33 +1578,29 @@ const deserializeAws_restJson1ListAccountPermissionsCommandError = async (output
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListCoverageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListCoverageCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        coveredResources: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.coveredResources !== undefined && data.coveredResources !== null) {
+    if (data.coveredResources != null) {
         contents.coveredResources = deserializeAws_restJson1CoveredResources(data.coveredResources, 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_restJson1ListCoverageCommand = deserializeAws_restJson1ListCoverageCommand;
 const deserializeAws_restJson1ListCoverageCommandError = async (output, context) => {
@@ -1720,7 +1608,6 @@ const deserializeAws_restJson1ListCoverageCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1734,37 +1621,32 @@ const deserializeAws_restJson1ListCoverageCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListCoverageStatisticsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListCoverageStatisticsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        countsByGroup: undefined,
-        nextToken: undefined,
-        totalCounts: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.countsByGroup !== undefined && data.countsByGroup !== null) {
+    if (data.countsByGroup != null) {
         contents.countsByGroup = deserializeAws_restJson1CountsList(data.countsByGroup, context);
     }
-    if (data.nextToken !== undefined && data.nextToken !== null) {
+    if (data.nextToken != null) {
         contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    if (data.totalCounts !== undefined && data.totalCounts !== null) {
+    if (data.totalCounts != null) {
         contents.totalCounts = (0, smithy_client_1.expectLong)(data.totalCounts);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListCoverageStatisticsCommand = deserializeAws_restJson1ListCoverageStatisticsCommand;
 const deserializeAws_restJson1ListCoverageStatisticsCommandError = async (output, context) => {
@@ -1772,7 +1654,6 @@ const deserializeAws_restJson1ListCoverageStatisticsCommandError = async (output
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1786,33 +1667,29 @@ const deserializeAws_restJson1ListCoverageStatisticsCommandError = async (output
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListDelegatedAdminAccountsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListDelegatedAdminAccountsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        delegatedAdminAccounts: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.delegatedAdminAccounts !== undefined && data.delegatedAdminAccounts !== null) {
+    if (data.delegatedAdminAccounts != null) {
         contents.delegatedAdminAccounts = deserializeAws_restJson1DelegatedAdminAccountList(data.delegatedAdminAccounts, 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_restJson1ListDelegatedAdminAccountsCommand = deserializeAws_restJson1ListDelegatedAdminAccountsCommand;
 const deserializeAws_restJson1ListDelegatedAdminAccountsCommandError = async (output, context) => {
@@ -1820,7 +1697,6 @@ const deserializeAws_restJson1ListDelegatedAdminAccountsCommandError = async (ou
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1837,33 +1713,29 @@ const deserializeAws_restJson1ListDelegatedAdminAccountsCommandError = async (ou
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                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),
-        filters: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.filters !== undefined && data.filters !== null) {
+    if (data.filters != null) {
         contents.filters = deserializeAws_restJson1FilterList(data.filters, 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) => {
@@ -1871,7 +1743,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 "AccessDeniedException":
@@ -1888,37 +1759,32 @@ const deserializeAws_restJson1ListFiltersCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListFindingAggregationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListFindingAggregationsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        aggregationType: undefined,
-        nextToken: undefined,
-        responses: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.aggregationType !== undefined && data.aggregationType !== null) {
+    if (data.aggregationType != null) {
         contents.aggregationType = (0, smithy_client_1.expectString)(data.aggregationType);
     }
-    if (data.nextToken !== undefined && data.nextToken !== null) {
+    if (data.nextToken != null) {
         contents.nextToken = (0, smithy_client_1.expectString)(data.nextToken);
     }
-    if (data.responses !== undefined && data.responses !== null) {
+    if (data.responses != null) {
         contents.responses = deserializeAws_restJson1AggregationResponseList(data.responses, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListFindingAggregationsCommand = deserializeAws_restJson1ListFindingAggregationsCommand;
 const deserializeAws_restJson1ListFindingAggregationsCommandError = async (output, context) => {
@@ -1926,7 +1792,6 @@ const deserializeAws_restJson1ListFindingAggregationsCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1940,33 +1805,29 @@ const deserializeAws_restJson1ListFindingAggregationsCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                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),
-        findings: undefined,
-        nextToken: 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_restJson1FindingList(data.findings, 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) => {
@@ -1974,7 +1835,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 "InternalServerException":
@@ -1988,33 +1848,29 @@ const deserializeAws_restJson1ListFindingsCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                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_restJson1MemberList(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) => {
@@ -2022,7 +1878,6 @@ const deserializeAws_restJson1ListMembersCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2039,29 +1894,26 @@ const deserializeAws_restJson1ListMembersCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                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) => {
@@ -2069,7 +1921,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 "InternalServerException":
@@ -2086,33 +1937,29 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListUsageTotalsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListUsageTotalsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        nextToken: undefined,
-        totals: 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.totals !== undefined && data.totals !== null) {
+    if (data.totals != null) {
         contents.totals = deserializeAws_restJson1UsageTotalList(data.totals, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListUsageTotalsCommand = deserializeAws_restJson1ListUsageTotalsCommand;
 const deserializeAws_restJson1ListUsageTotalsCommandError = async (output, context) => {
@@ -2120,7 +1967,6 @@ const deserializeAws_restJson1ListUsageTotalsCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2137,25 +1983,23 @@ const deserializeAws_restJson1ListUsageTotalsCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1TagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && 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) => {
@@ -2163,7 +2007,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":
@@ -2183,25 +2026,23 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UntagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && 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) => {
@@ -2209,7 +2050,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 "InternalServerException":
@@ -2226,25 +2066,23 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateConfigurationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateConfigurationCommand = deserializeAws_restJson1UpdateConfigurationCommand;
 const deserializeAws_restJson1UpdateConfigurationCommandError = async (output, context) => {
@@ -2252,7 +2090,6 @@ const deserializeAws_restJson1UpdateConfigurationCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2269,29 +2106,26 @@ const deserializeAws_restJson1UpdateConfigurationCommandError = async (output, c
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                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),
-        arn: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.arn !== undefined && data.arn !== null) {
+    if (data.arn != null) {
         contents.arn = (0, smithy_client_1.expectString)(data.arn);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateFilterCommand = deserializeAws_restJson1UpdateFilterCommand;
 const deserializeAws_restJson1UpdateFilterCommandError = async (output, context) => {
@@ -2299,7 +2133,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 "AccessDeniedException":
@@ -2319,29 +2152,26 @@ const deserializeAws_restJson1UpdateFilterCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                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),
-        autoEnable: 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 = deserializeAws_restJson1AutoEnable(data.autoEnable, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateOrganizationConfigurationCommand = deserializeAws_restJson1UpdateOrganizationConfigurationCommand;
 const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = async (output, context) => {
@@ -2349,7 +2179,6 @@ const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = asyn
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2366,20 +2195,19 @@ const deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = asyn
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new Inspector2ServiceException_1.Inspector2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: Inspector2ServiceException_1.Inspector2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
+const map = smithy_client_1.map;
 const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.AccessDeniedException({
@@ -2389,9 +2217,9 @@ const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutpu
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 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);
     }
     const exception = new models_0_1.BadRequestException({
@@ -2401,15 +2229,15 @@ const deserializeAws_restJson1BadRequestExceptionResponse = async (parsedOutput,
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
-    if (data.resourceId !== undefined && data.resourceId !== null) {
+    if (data.resourceId != null) {
         contents.resourceId = (0, smithy_client_1.expectString)(data.resourceId);
     }
-    if (data.resourceType !== undefined && data.resourceType !== null) {
+    if (data.resourceType != null) {
         contents.resourceType = (0, smithy_client_1.expectString)(data.resourceType);
     }
     const exception = new models_0_1.ConflictException({
@@ -2419,12 +2247,14 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
-    if (parsedOutput.headers["retry-after"] !== undefined) {
-        contents.retryAfterSeconds = (0, smithy_client_1.strictParseInt32)(parsedOutput.headers["retry-after"]);
-    }
+    const contents = map({
+        retryAfterSeconds: [
+            () => void 0 !== parsedOutput.headers["retry-after"],
+            () => (0, smithy_client_1.strictParseInt32)(parsedOutput.headers["retry-after"]),
+        ],
+    });
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.InternalServerException({
@@ -2434,9 +2264,9 @@ const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOut
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ResourceNotFoundException({
@@ -2446,12 +2276,12 @@ const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedO
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
-    if (data.resourceId !== undefined && data.resourceId !== null) {
+    if (data.resourceId != null) {
         contents.resourceId = (0, smithy_client_1.expectString)(data.resourceId);
     }
     const exception = new models_0_1.ServiceQuotaExceededException({
@@ -2461,9 +2291,9 @@ const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (par
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ThrottlingException({
@@ -2473,15 +2303,15 @@ const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput,
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.fields !== undefined && data.fields !== null) {
+    if (data.fields != null) {
         contents.fields = deserializeAws_restJson1ValidationExceptionFields(data.fields, context);
     }
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
-    if (data.reason !== undefined && data.reason !== null) {
+    if (data.reason != null) {
         contents.reason = (0, smithy_client_1.expectString)(data.reason);
     }
     const exception = new models_0_1.ValidationException({
@@ -2502,9 +2332,6 @@ const serializeAws_restJson1AccountIdSet = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2604,9 +2431,6 @@ const serializeAws_restJson1CoverageMapFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CoverageMapFilter(entry, context);
     });
 };
@@ -2620,9 +2444,6 @@ const serializeAws_restJson1CoverageStringFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CoverageStringFilter(entry, context);
     });
 };
@@ -2636,9 +2457,6 @@ const serializeAws_restJson1DateFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1DateFilter(entry, context);
     });
 };
@@ -2653,9 +2471,6 @@ const serializeAws_restJson1DisableResourceTypeList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2684,9 +2499,6 @@ const serializeAws_restJson1EnableResourceTypeList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2694,9 +2506,6 @@ const serializeAws_restJson1FilterArnList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2819,9 +2628,6 @@ const serializeAws_restJson1MapFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1MapFilter(entry, context);
     });
 };
@@ -2829,9 +2635,6 @@ const serializeAws_restJson1MeteringAccountIdList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2845,9 +2648,6 @@ const serializeAws_restJson1NumberFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1NumberFilter(entry, context);
     });
 };
@@ -2878,9 +2678,6 @@ const serializeAws_restJson1PackageFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1PackageFilter(entry, context);
     });
 };
@@ -2894,9 +2691,6 @@ const serializeAws_restJson1PortRangeFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1PortRangeFilter(entry, context);
     });
 };
@@ -2925,9 +2719,6 @@ const serializeAws_restJson1StringFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1StringFilter(entry, context);
     });
 };
@@ -2957,9 +2748,6 @@ const serializeAws_restJson1UsageAccountIdList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3010,47 +2798,47 @@ const deserializeAws_restJson1AccountStateList = (output, context) => {
     return retVal;
 };
 const deserializeAws_restJson1AggregationResponse = (output, context) => {
-    if (output.accountAggregation !== undefined && output.accountAggregation !== null) {
+    if (output.accountAggregation != null) {
         return {
             accountAggregation: deserializeAws_restJson1AccountAggregationResponse(output.accountAggregation, context),
         };
     }
-    if (output.amiAggregation !== undefined && output.amiAggregation !== null) {
+    if (output.amiAggregation != null) {
         return {
             amiAggregation: deserializeAws_restJson1AmiAggregationResponse(output.amiAggregation, context),
         };
     }
-    if (output.awsEcrContainerAggregation !== undefined && output.awsEcrContainerAggregation !== null) {
+    if (output.awsEcrContainerAggregation != null) {
         return {
             awsEcrContainerAggregation: deserializeAws_restJson1AwsEcrContainerAggregationResponse(output.awsEcrContainerAggregation, context),
         };
     }
-    if (output.ec2InstanceAggregation !== undefined && output.ec2InstanceAggregation !== null) {
+    if (output.ec2InstanceAggregation != null) {
         return {
             ec2InstanceAggregation: deserializeAws_restJson1Ec2InstanceAggregationResponse(output.ec2InstanceAggregation, context),
         };
     }
-    if (output.findingTypeAggregation !== undefined && output.findingTypeAggregation !== null) {
+    if (output.findingTypeAggregation != null) {
         return {
             findingTypeAggregation: deserializeAws_restJson1FindingTypeAggregationResponse(output.findingTypeAggregation, context),
         };
     }
-    if (output.imageLayerAggregation !== undefined && output.imageLayerAggregation !== null) {
+    if (output.imageLayerAggregation != null) {
         return {
             imageLayerAggregation: deserializeAws_restJson1ImageLayerAggregationResponse(output.imageLayerAggregation, context),
         };
     }
-    if (output.packageAggregation !== undefined && output.packageAggregation !== null) {
+    if (output.packageAggregation != null) {
         return {
             packageAggregation: deserializeAws_restJson1PackageAggregationResponse(output.packageAggregation, context),
         };
     }
-    if (output.repositoryAggregation !== undefined && output.repositoryAggregation !== null) {
+    if (output.repositoryAggregation != null) {
         return {
             repositoryAggregation: deserializeAws_restJson1RepositoryAggregationResponse(output.repositoryAggregation, context),
         };
     }
-    if (output.titleAggregation !== undefined && output.titleAggregation !== null) {
+    if (output.titleAggregation != null) {
         return {
             titleAggregation: deserializeAws_restJson1TitleAggregationResponse(output.titleAggregation, context),
         };