@aws-sdk/client-workspaces-web 3.310.0 → 3.315.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,5 +1,5 @@
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectInt32 as __expectInt32, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, map as __map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, strictParseInt32 as __strictParseInt32, throwDefaultError, } from "@aws-sdk/smithy-client";
+import { _json, decorateServiceException as __decorateServiceException, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, strictParseInt32 as __strictParseInt32, take, withBaseException, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
 import { AccessDeniedException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, TooManyTagsException, ValidationException, } from "../models/models_0";
 import { WorkSpacesWebServiceException as __BaseException } from "../models/WorkSpacesWebServiceException";
@@ -114,15 +114,13 @@ export const se_CreateBrowserSettingsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/browserSettings";
     let body;
-    body = JSON.stringify({
-        ...(input.additionalEncryptionContext != null && {
-            additionalEncryptionContext: se_EncryptionContextMap(input.additionalEncryptionContext, context),
-        }),
-        ...(input.browserPolicy != null && { browserPolicy: input.browserPolicy }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.customerManagedKey != null && { customerManagedKey: input.customerManagedKey }),
-        ...(input.tags != null && { tags: se_TagList(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        additionalEncryptionContext: (_) => _json(_),
+        browserPolicy: [],
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        customerManagedKey: [],
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -140,15 +138,13 @@ export const se_CreateIdentityProviderCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/identityProviders";
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.identityProviderDetails != null && {
-            identityProviderDetails: se_IdentityProviderDetails(input.identityProviderDetails, context),
-        }),
-        ...(input.identityProviderName != null && { identityProviderName: input.identityProviderName }),
-        ...(input.identityProviderType != null && { identityProviderType: input.identityProviderType }),
-        ...(input.portalArn != null && { portalArn: input.portalArn }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        identityProviderDetails: (_) => _json(_),
+        identityProviderName: [],
+        identityProviderType: [],
+        portalArn: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -166,15 +162,13 @@ export const se_CreateNetworkSettingsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/networkSettings";
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.securityGroupIds != null && {
-            securityGroupIds: se_SecurityGroupIdList(input.securityGroupIds, context),
-        }),
-        ...(input.subnetIds != null && { subnetIds: se_SubnetIdList(input.subnetIds, context) }),
-        ...(input.tags != null && { tags: se_TagList(input.tags, context) }),
-        ...(input.vpcId != null && { vpcId: input.vpcId }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        securityGroupIds: (_) => _json(_),
+        subnetIds: (_) => _json(_),
+        tags: (_) => _json(_),
+        vpcId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -192,16 +186,14 @@ export const se_CreatePortalCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/portals";
     let body;
-    body = JSON.stringify({
-        ...(input.additionalEncryptionContext != null && {
-            additionalEncryptionContext: se_EncryptionContextMap(input.additionalEncryptionContext, context),
-        }),
-        ...(input.authenticationType != null && { authenticationType: input.authenticationType }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.customerManagedKey != null && { customerManagedKey: input.customerManagedKey }),
-        ...(input.displayName != null && { displayName: input.displayName }),
-        ...(input.tags != null && { tags: se_TagList(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        additionalEncryptionContext: (_) => _json(_),
+        authenticationType: [],
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        customerManagedKey: [],
+        displayName: [],
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -219,11 +211,11 @@ export const se_CreateTrustStoreCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/trustStores";
     let body;
-    body = JSON.stringify({
-        ...(input.certificateList != null && { certificateList: se_CertificateList(input.certificateList, context) }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.tags != null && { tags: se_TagList(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        certificateList: (_) => se_CertificateList(_, context),
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -241,11 +233,11 @@ export const se_CreateUserAccessLoggingSettingsCommand = async (input, context)
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/userAccessLoggingSettings";
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.kinesisStreamArn != null && { kinesisStreamArn: input.kinesisStreamArn }),
-        ...(input.tags != null && { tags: se_TagList(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        kinesisStreamArn: [],
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -263,19 +255,17 @@ export const se_CreateUserSettingsCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/userSettings";
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.copyAllowed != null && { copyAllowed: input.copyAllowed }),
-        ...(input.disconnectTimeoutInMinutes != null && { disconnectTimeoutInMinutes: input.disconnectTimeoutInMinutes }),
-        ...(input.downloadAllowed != null && { downloadAllowed: input.downloadAllowed }),
-        ...(input.idleDisconnectTimeoutInMinutes != null && {
-            idleDisconnectTimeoutInMinutes: input.idleDisconnectTimeoutInMinutes,
-        }),
-        ...(input.pasteAllowed != null && { pasteAllowed: input.pasteAllowed }),
-        ...(input.printAllowed != null && { printAllowed: input.printAllowed }),
-        ...(input.tags != null && { tags: se_TagList(input.tags, context) }),
-        ...(input.uploadAllowed != null && { uploadAllowed: input.uploadAllowed }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        copyAllowed: [],
+        disconnectTimeoutInMinutes: [],
+        downloadAllowed: [],
+        idleDisconnectTimeoutInMinutes: [],
+        pasteAllowed: [],
+        printAllowed: [],
+        tags: (_) => _json(_),
+        uploadAllowed: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -816,10 +806,10 @@ export const se_TagResourceCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{resourceArn+}";
     resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", () => input.resourceArn, "{resourceArn+}", true);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.tags != null && { tags: se_TagList(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -861,10 +851,10 @@ export const se_UpdateBrowserSettingsCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/browserSettings/{browserSettingsArn+}";
     resolvedPath = __resolvedPath(resolvedPath, input, "browserSettingsArn", () => input.browserSettingsArn, "{browserSettingsArn+}", true);
     let body;
-    body = JSON.stringify({
-        ...(input.browserPolicy != null && { browserPolicy: input.browserPolicy }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-    });
+    body = JSON.stringify(take(input, {
+        browserPolicy: [],
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -883,14 +873,12 @@ export const se_UpdateIdentityProviderCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/identityProviders/{identityProviderArn+}";
     resolvedPath = __resolvedPath(resolvedPath, input, "identityProviderArn", () => input.identityProviderArn, "{identityProviderArn+}", true);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.identityProviderDetails != null && {
-            identityProviderDetails: se_IdentityProviderDetails(input.identityProviderDetails, context),
-        }),
-        ...(input.identityProviderName != null && { identityProviderName: input.identityProviderName }),
-        ...(input.identityProviderType != null && { identityProviderType: input.identityProviderType }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        identityProviderDetails: (_) => _json(_),
+        identityProviderName: [],
+        identityProviderType: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -909,14 +897,12 @@ export const se_UpdateNetworkSettingsCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/networkSettings/{networkSettingsArn+}";
     resolvedPath = __resolvedPath(resolvedPath, input, "networkSettingsArn", () => input.networkSettingsArn, "{networkSettingsArn+}", true);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.securityGroupIds != null && {
-            securityGroupIds: se_SecurityGroupIdList(input.securityGroupIds, context),
-        }),
-        ...(input.subnetIds != null && { subnetIds: se_SubnetIdList(input.subnetIds, context) }),
-        ...(input.vpcId != null && { vpcId: input.vpcId }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        securityGroupIds: (_) => _json(_),
+        subnetIds: (_) => _json(_),
+        vpcId: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -935,10 +921,10 @@ export const se_UpdatePortalCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/portals/{portalArn+}";
     resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", () => input.portalArn, "{portalArn+}", true);
     let body;
-    body = JSON.stringify({
-        ...(input.authenticationType != null && { authenticationType: input.authenticationType }),
-        ...(input.displayName != null && { displayName: input.displayName }),
-    });
+    body = JSON.stringify(take(input, {
+        authenticationType: [],
+        displayName: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -957,13 +943,11 @@ export const se_UpdateTrustStoreCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/trustStores/{trustStoreArn+}";
     resolvedPath = __resolvedPath(resolvedPath, input, "trustStoreArn", () => input.trustStoreArn, "{trustStoreArn+}", true);
     let body;
-    body = JSON.stringify({
-        ...(input.certificatesToAdd != null && { certificatesToAdd: se_CertificateList(input.certificatesToAdd, context) }),
-        ...(input.certificatesToDelete != null && {
-            certificatesToDelete: se_CertificateThumbprintList(input.certificatesToDelete, context),
-        }),
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-    });
+    body = JSON.stringify(take(input, {
+        certificatesToAdd: (_) => se_CertificateList(_, context),
+        certificatesToDelete: (_) => _json(_),
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -983,10 +967,10 @@ export const se_UpdateUserAccessLoggingSettingsCommand = async (input, context)
         "/userAccessLoggingSettings/{userAccessLoggingSettingsArn+}";
     resolvedPath = __resolvedPath(resolvedPath, input, "userAccessLoggingSettingsArn", () => input.userAccessLoggingSettingsArn, "{userAccessLoggingSettingsArn+}", true);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.kinesisStreamArn != null && { kinesisStreamArn: input.kinesisStreamArn }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        kinesisStreamArn: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -1005,18 +989,16 @@ export const se_UpdateUserSettingsCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/userSettings/{userSettingsArn+}";
     resolvedPath = __resolvedPath(resolvedPath, input, "userSettingsArn", () => input.userSettingsArn, "{userSettingsArn+}", true);
     let body;
-    body = JSON.stringify({
-        clientToken: input.clientToken ?? generateIdempotencyToken(),
-        ...(input.copyAllowed != null && { copyAllowed: input.copyAllowed }),
-        ...(input.disconnectTimeoutInMinutes != null && { disconnectTimeoutInMinutes: input.disconnectTimeoutInMinutes }),
-        ...(input.downloadAllowed != null && { downloadAllowed: input.downloadAllowed }),
-        ...(input.idleDisconnectTimeoutInMinutes != null && {
-            idleDisconnectTimeoutInMinutes: input.idleDisconnectTimeoutInMinutes,
-        }),
-        ...(input.pasteAllowed != null && { pasteAllowed: input.pasteAllowed }),
-        ...(input.printAllowed != null && { printAllowed: input.printAllowed }),
-        ...(input.uploadAllowed != null && { uploadAllowed: input.uploadAllowed }),
-    });
+    body = JSON.stringify(take(input, {
+        clientToken: (_) => _ ?? generateIdempotencyToken(),
+        copyAllowed: [],
+        disconnectTimeoutInMinutes: [],
+        downloadAllowed: [],
+        idleDisconnectTimeoutInMinutes: [],
+        pasteAllowed: [],
+        printAllowed: [],
+        uploadAllowed: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -1035,12 +1017,11 @@ export const de_AssociateBrowserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.browserSettingsArn != null) {
-        contents.browserSettingsArn = __expectString(data.browserSettingsArn);
-    }
-    if (data.portalArn != null) {
-        contents.portalArn = __expectString(data.portalArn);
-    }
+    const doc = take(data, {
+        browserSettingsArn: __expectString,
+        portalArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_AssociateBrowserSettingsCommandError = async (output, context) => {
@@ -1070,10 +1051,9 @@ const de_AssociateBrowserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1086,12 +1066,11 @@ export const de_AssociateNetworkSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.networkSettingsArn != null) {
-        contents.networkSettingsArn = __expectString(data.networkSettingsArn);
-    }
-    if (data.portalArn != null) {
-        contents.portalArn = __expectString(data.portalArn);
-    }
+    const doc = take(data, {
+        networkSettingsArn: __expectString,
+        portalArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_AssociateNetworkSettingsCommandError = async (output, context) => {
@@ -1121,10 +1100,9 @@ const de_AssociateNetworkSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1137,12 +1115,11 @@ export const de_AssociateTrustStoreCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.portalArn != null) {
-        contents.portalArn = __expectString(data.portalArn);
-    }
-    if (data.trustStoreArn != null) {
-        contents.trustStoreArn = __expectString(data.trustStoreArn);
-    }
+    const doc = take(data, {
+        portalArn: __expectString,
+        trustStoreArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_AssociateTrustStoreCommandError = async (output, context) => {
@@ -1169,10 +1146,9 @@ const de_AssociateTrustStoreCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1185,12 +1161,11 @@ export const de_AssociateUserAccessLoggingSettingsCommand = async (output, conte
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.portalArn != null) {
-        contents.portalArn = __expectString(data.portalArn);
-    }
-    if (data.userAccessLoggingSettingsArn != null) {
-        contents.userAccessLoggingSettingsArn = __expectString(data.userAccessLoggingSettingsArn);
-    }
+    const doc = take(data, {
+        portalArn: __expectString,
+        userAccessLoggingSettingsArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_AssociateUserAccessLoggingSettingsCommandError = async (output, context) => {
@@ -1220,10 +1195,9 @@ const de_AssociateUserAccessLoggingSettingsCommandError = async (output, context
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1236,12 +1210,11 @@ export const de_AssociateUserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.portalArn != null) {
-        contents.portalArn = __expectString(data.portalArn);
-    }
-    if (data.userSettingsArn != null) {
-        contents.userSettingsArn = __expectString(data.userSettingsArn);
-    }
+    const doc = take(data, {
+        portalArn: __expectString,
+        userSettingsArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_AssociateUserSettingsCommandError = async (output, context) => {
@@ -1271,10 +1244,9 @@ const de_AssociateUserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1287,9 +1259,10 @@ export const de_CreateBrowserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.browserSettingsArn != null) {
-        contents.browserSettingsArn = __expectString(data.browserSettingsArn);
-    }
+    const doc = take(data, {
+        browserSettingsArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateBrowserSettingsCommandError = async (output, context) => {
@@ -1322,10 +1295,9 @@ const de_CreateBrowserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1338,9 +1310,10 @@ export const de_CreateIdentityProviderCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.identityProviderArn != null) {
-        contents.identityProviderArn = __expectString(data.identityProviderArn);
-    }
+    const doc = take(data, {
+        identityProviderArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateIdentityProviderCommandError = async (output, context) => {
@@ -1373,10 +1346,9 @@ const de_CreateIdentityProviderCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1389,9 +1361,10 @@ export const de_CreateNetworkSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.networkSettingsArn != null) {
-        contents.networkSettingsArn = __expectString(data.networkSettingsArn);
-    }
+    const doc = take(data, {
+        networkSettingsArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateNetworkSettingsCommandError = async (output, context) => {
@@ -1421,10 +1394,9 @@ const de_CreateNetworkSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1437,12 +1409,11 @@ export const de_CreatePortalCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.portalArn != null) {
-        contents.portalArn = __expectString(data.portalArn);
-    }
-    if (data.portalEndpoint != null) {
-        contents.portalEndpoint = __expectString(data.portalEndpoint);
-    }
+    const doc = take(data, {
+        portalArn: __expectString,
+        portalEndpoint: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreatePortalCommandError = async (output, context) => {
@@ -1475,10 +1446,9 @@ const de_CreatePortalCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1491,9 +1461,10 @@ export const de_CreateTrustStoreCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.trustStoreArn != null) {
-        contents.trustStoreArn = __expectString(data.trustStoreArn);
-    }
+    const doc = take(data, {
+        trustStoreArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateTrustStoreCommandError = async (output, context) => {
@@ -1523,10 +1494,9 @@ const de_CreateTrustStoreCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1539,9 +1509,10 @@ export const de_CreateUserAccessLoggingSettingsCommand = async (output, context)
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userAccessLoggingSettingsArn != null) {
-        contents.userAccessLoggingSettingsArn = __expectString(data.userAccessLoggingSettingsArn);
-    }
+    const doc = take(data, {
+        userAccessLoggingSettingsArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateUserAccessLoggingSettingsCommandError = async (output, context) => {
@@ -1571,10 +1542,9 @@ const de_CreateUserAccessLoggingSettingsCommandError = async (output, context) =
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1587,9 +1557,10 @@ export const de_CreateUserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userSettingsArn != null) {
-        contents.userSettingsArn = __expectString(data.userSettingsArn);
-    }
+    const doc = take(data, {
+        userSettingsArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateUserSettingsCommandError = async (output, context) => {
@@ -1619,10 +1590,9 @@ const de_CreateUserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1661,10 +1631,9 @@ const de_DeleteBrowserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1703,10 +1672,9 @@ const de_DeleteIdentityProviderCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1745,10 +1713,9 @@ const de_DeleteNetworkSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1787,10 +1754,9 @@ const de_DeletePortalCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1829,10 +1795,9 @@ const de_DeleteTrustStoreCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1871,10 +1836,9 @@ const de_DeleteUserAccessLoggingSettingsCommandError = async (output, context) =
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1913,10 +1877,9 @@ const de_DeleteUserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1955,10 +1918,9 @@ const de_DisassociateBrowserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1997,10 +1959,9 @@ const de_DisassociateNetworkSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2039,10 +2000,9 @@ const de_DisassociateTrustStoreCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2081,10 +2041,9 @@ const de_DisassociateUserAccessLoggingSettingsCommandError = async (output, cont
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2123,10 +2082,9 @@ const de_DisassociateUserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2139,9 +2097,10 @@ export const de_GetBrowserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.browserSettings != null) {
-        contents.browserSettings = de_BrowserSettings(data.browserSettings, context);
-    }
+    const doc = take(data, {
+        browserSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetBrowserSettingsCommandError = async (output, context) => {
@@ -2168,10 +2127,9 @@ const de_GetBrowserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2184,9 +2142,10 @@ export const de_GetIdentityProviderCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.identityProvider != null) {
-        contents.identityProvider = de_IdentityProvider(data.identityProvider, context);
-    }
+    const doc = take(data, {
+        identityProvider: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetIdentityProviderCommandError = async (output, context) => {
@@ -2213,10 +2172,9 @@ const de_GetIdentityProviderCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2229,9 +2187,10 @@ export const de_GetNetworkSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.networkSettings != null) {
-        contents.networkSettings = de_NetworkSettings(data.networkSettings, context);
-    }
+    const doc = take(data, {
+        networkSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetNetworkSettingsCommandError = async (output, context) => {
@@ -2258,10 +2217,9 @@ const de_GetNetworkSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2274,9 +2232,10 @@ export const de_GetPortalCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.portal != null) {
-        contents.portal = de_Portal(data.portal, context);
-    }
+    const doc = take(data, {
+        portal: (_) => de_Portal(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetPortalCommandError = async (output, context) => {
@@ -2303,10 +2262,9 @@ const de_GetPortalCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2319,12 +2277,11 @@ export const de_GetPortalServiceProviderMetadataCommand = async (output, context
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.portalArn != null) {
-        contents.portalArn = __expectString(data.portalArn);
-    }
-    if (data.serviceProviderSamlMetadata != null) {
-        contents.serviceProviderSamlMetadata = __expectString(data.serviceProviderSamlMetadata);
-    }
+    const doc = take(data, {
+        portalArn: __expectString,
+        serviceProviderSamlMetadata: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetPortalServiceProviderMetadataCommandError = async (output, context) => {
@@ -2351,10 +2308,9 @@ const de_GetPortalServiceProviderMetadataCommandError = async (output, context)
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2367,9 +2323,10 @@ export const de_GetTrustStoreCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.trustStore != null) {
-        contents.trustStore = de_TrustStore(data.trustStore, context);
-    }
+    const doc = take(data, {
+        trustStore: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetTrustStoreCommandError = async (output, context) => {
@@ -2396,10 +2353,9 @@ const de_GetTrustStoreCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2412,12 +2368,11 @@ export const de_GetTrustStoreCertificateCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.certificate != null) {
-        contents.certificate = de_Certificate(data.certificate, context);
-    }
-    if (data.trustStoreArn != null) {
-        contents.trustStoreArn = __expectString(data.trustStoreArn);
-    }
+    const doc = take(data, {
+        certificate: (_) => de_Certificate(_, context),
+        trustStoreArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetTrustStoreCertificateCommandError = async (output, context) => {
@@ -2444,10 +2399,9 @@ const de_GetTrustStoreCertificateCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2460,9 +2414,10 @@ export const de_GetUserAccessLoggingSettingsCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userAccessLoggingSettings != null) {
-        contents.userAccessLoggingSettings = de_UserAccessLoggingSettings(data.userAccessLoggingSettings, context);
-    }
+    const doc = take(data, {
+        userAccessLoggingSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetUserAccessLoggingSettingsCommandError = async (output, context) => {
@@ -2489,10 +2444,9 @@ const de_GetUserAccessLoggingSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2505,9 +2459,10 @@ export const de_GetUserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userSettings != null) {
-        contents.userSettings = de_UserSettings(data.userSettings, context);
-    }
+    const doc = take(data, {
+        userSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetUserSettingsCommandError = async (output, context) => {
@@ -2534,10 +2489,9 @@ const de_GetUserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2550,12 +2504,11 @@ export const de_ListBrowserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.browserSettings != null) {
-        contents.browserSettings = de_BrowserSettingsList(data.browserSettings, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        browserSettings: _json,
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListBrowserSettingsCommandError = async (output, context) => {
@@ -2579,10 +2532,9 @@ const de_ListBrowserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2595,12 +2547,11 @@ export const de_ListIdentityProvidersCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.identityProviders != null) {
-        contents.identityProviders = de_IdentityProviderList(data.identityProviders, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        identityProviders: _json,
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListIdentityProvidersCommandError = async (output, context) => {
@@ -2624,10 +2575,9 @@ const de_ListIdentityProvidersCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2640,12 +2590,11 @@ export const de_ListNetworkSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.networkSettings != null) {
-        contents.networkSettings = de_NetworkSettingsList(data.networkSettings, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        networkSettings: _json,
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListNetworkSettingsCommandError = async (output, context) => {
@@ -2669,10 +2618,9 @@ const de_ListNetworkSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2685,12 +2633,11 @@ export const de_ListPortalsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.portals != null) {
-        contents.portals = de_PortalList(data.portals, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        portals: (_) => de_PortalList(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListPortalsCommandError = async (output, context) => {
@@ -2714,10 +2661,9 @@ const de_ListPortalsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2730,9 +2676,10 @@ export const de_ListTagsForResourceCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.tags != null) {
-        contents.tags = de_TagList(data.tags, context);
-    }
+    const doc = take(data, {
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListTagsForResourceCommandError = async (output, context) => {
@@ -2759,10 +2706,9 @@ const de_ListTagsForResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2775,15 +2721,12 @@ export const de_ListTrustStoreCertificatesCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.certificateList != null) {
-        contents.certificateList = de_CertificateSummaryList(data.certificateList, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.trustStoreArn != null) {
-        contents.trustStoreArn = __expectString(data.trustStoreArn);
-    }
+    const doc = take(data, {
+        certificateList: (_) => de_CertificateSummaryList(_, context),
+        nextToken: __expectString,
+        trustStoreArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListTrustStoreCertificatesCommandError = async (output, context) => {
@@ -2810,10 +2753,9 @@ const de_ListTrustStoreCertificatesCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2826,12 +2768,11 @@ export const de_ListTrustStoresCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.trustStores != null) {
-        contents.trustStores = de_TrustStoreSummaryList(data.trustStores, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        trustStores: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListTrustStoresCommandError = async (output, context) => {
@@ -2855,10 +2796,9 @@ const de_ListTrustStoresCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2871,12 +2811,11 @@ export const de_ListUserAccessLoggingSettingsCommand = async (output, context) =
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.userAccessLoggingSettings != null) {
-        contents.userAccessLoggingSettings = de_UserAccessLoggingSettingsList(data.userAccessLoggingSettings, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        userAccessLoggingSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListUserAccessLoggingSettingsCommandError = async (output, context) => {
@@ -2900,10 +2839,9 @@ const de_ListUserAccessLoggingSettingsCommandError = async (output, context) =>
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2916,12 +2854,11 @@ export const de_ListUserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
-    if (data.userSettings != null) {
-        contents.userSettings = de_UserSettingsList(data.userSettings, context);
-    }
+    const doc = take(data, {
+        nextToken: __expectString,
+        userSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListUserSettingsCommandError = async (output, context) => {
@@ -2945,10 +2882,9 @@ const de_ListUserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2990,10 +2926,9 @@ const de_TagResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -3032,10 +2967,9 @@ const de_UntagResourceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -3048,9 +2982,10 @@ export const de_UpdateBrowserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.browserSettings != null) {
-        contents.browserSettings = de_BrowserSettings(data.browserSettings, context);
-    }
+    const doc = take(data, {
+        browserSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateBrowserSettingsCommandError = async (output, context) => {
@@ -3077,10 +3012,9 @@ const de_UpdateBrowserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -3093,9 +3027,10 @@ export const de_UpdateIdentityProviderCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.identityProvider != null) {
-        contents.identityProvider = de_IdentityProvider(data.identityProvider, context);
-    }
+    const doc = take(data, {
+        identityProvider: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateIdentityProviderCommandError = async (output, context) => {
@@ -3122,10 +3057,9 @@ const de_UpdateIdentityProviderCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -3138,9 +3072,10 @@ export const de_UpdateNetworkSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.networkSettings != null) {
-        contents.networkSettings = de_NetworkSettings(data.networkSettings, context);
-    }
+    const doc = take(data, {
+        networkSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateNetworkSettingsCommandError = async (output, context) => {
@@ -3167,10 +3102,9 @@ const de_UpdateNetworkSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -3183,9 +3117,10 @@ export const de_UpdatePortalCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.portal != null) {
-        contents.portal = de_Portal(data.portal, context);
-    }
+    const doc = take(data, {
+        portal: (_) => de_Portal(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdatePortalCommandError = async (output, context) => {
@@ -3212,10 +3147,9 @@ const de_UpdatePortalCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -3228,9 +3162,10 @@ export const de_UpdateTrustStoreCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.trustStoreArn != null) {
-        contents.trustStoreArn = __expectString(data.trustStoreArn);
-    }
+    const doc = take(data, {
+        trustStoreArn: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateTrustStoreCommandError = async (output, context) => {
@@ -3260,10 +3195,9 @@ const de_UpdateTrustStoreCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -3276,9 +3210,10 @@ export const de_UpdateUserAccessLoggingSettingsCommand = async (output, context)
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userAccessLoggingSettings != null) {
-        contents.userAccessLoggingSettings = de_UserAccessLoggingSettings(data.userAccessLoggingSettings, context);
-    }
+    const doc = take(data, {
+        userAccessLoggingSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateUserAccessLoggingSettingsCommandError = async (output, context) => {
@@ -3305,10 +3240,9 @@ const de_UpdateUserAccessLoggingSettingsCommandError = async (output, context) =
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -3321,9 +3255,10 @@ export const de_UpdateUserSettingsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.userSettings != null) {
-        contents.userSettings = de_UserSettings(data.userSettings, context);
-    }
+    const doc = take(data, {
+        userSettings: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateUserSettingsCommandError = async (output, context) => {
@@ -3350,21 +3285,21 @@ const de_UpdateUserSettingsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
 };
-const map = __map;
+const throwDefaultError = withBaseException(__BaseException);
 const de_AccessDeniedExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new AccessDeniedException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -3374,15 +3309,12 @@ const de_AccessDeniedExceptionRes = async (parsedOutput, context) => {
 const de_ConflictExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.resourceId != null) {
-        contents.resourceId = __expectString(data.resourceId);
-    }
-    if (data.resourceType != null) {
-        contents.resourceType = __expectString(data.resourceType);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        resourceId: __expectString,
+        resourceType: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ConflictException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -3397,9 +3329,10 @@ const de_InternalServerExceptionRes = async (parsedOutput, context) => {
         ],
     });
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new InternalServerException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -3409,15 +3342,12 @@ const de_InternalServerExceptionRes = async (parsedOutput, context) => {
 const de_ResourceNotFoundExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.resourceId != null) {
-        contents.resourceId = __expectString(data.resourceId);
-    }
-    if (data.resourceType != null) {
-        contents.resourceType = __expectString(data.resourceType);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        resourceId: __expectString,
+        resourceType: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ResourceNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -3427,21 +3357,14 @@ const de_ResourceNotFoundExceptionRes = async (parsedOutput, context) => {
 const de_ServiceQuotaExceededExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.quotaCode != null) {
-        contents.quotaCode = __expectString(data.quotaCode);
-    }
-    if (data.resourceId != null) {
-        contents.resourceId = __expectString(data.resourceId);
-    }
-    if (data.resourceType != null) {
-        contents.resourceType = __expectString(data.resourceType);
-    }
-    if (data.serviceCode != null) {
-        contents.serviceCode = __expectString(data.serviceCode);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        quotaCode: __expectString,
+        resourceId: __expectString,
+        resourceType: __expectString,
+        serviceCode: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ServiceQuotaExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -3456,15 +3379,12 @@ const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
         ],
     });
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.quotaCode != null) {
-        contents.quotaCode = __expectString(data.quotaCode);
-    }
-    if (data.serviceCode != null) {
-        contents.serviceCode = __expectString(data.serviceCode);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        quotaCode: __expectString,
+        serviceCode: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ThrottlingException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -3474,12 +3394,11 @@ const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
 const de_TooManyTagsExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.resourceName != null) {
-        contents.resourceName = __expectString(data.resourceName);
-    }
+    const doc = take(data, {
+        message: __expectString,
+        resourceName: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new TooManyTagsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -3489,15 +3408,12 @@ const de_TooManyTagsExceptionRes = async (parsedOutput, context) => {
 const de_ValidationExceptionRes = async (parsedOutput, context) => {
     const contents = map({});
     const data = parsedOutput.body;
-    if (data.fieldList != null) {
-        contents.fieldList = de_ValidationExceptionFieldList(data.fieldList, context);
-    }
-    if (data.message != null) {
-        contents.message = __expectString(data.message);
-    }
-    if (data.reason != null) {
-        contents.reason = __expectString(data.reason);
-    }
+    const doc = take(data, {
+        fieldList: _json,
+        message: __expectString,
+        reason: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ValidationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -3511,380 +3427,75 @@ const se_CertificateList = (input, context) => {
         return context.base64Encoder(entry);
     });
 };
-const se_CertificateThumbprintList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_EncryptionContextMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const se_IdentityProviderDetails = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-const se_SecurityGroupIdList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_SubnetIdList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return entry;
-    });
-};
-const se_Tag = (input, context) => {
-    return {
-        ...(input.Key != null && { Key: input.Key }),
-        ...(input.Value != null && { Value: input.Value }),
-    };
-};
-const se_TagList = (input, context) => {
-    return input
-        .filter((e) => e != null)
-        .map((entry) => {
-        return se_Tag(entry, context);
-    });
-};
-const de_ArnList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_BrowserSettings = (output, context) => {
-    return {
-        associatedPortalArns: output.associatedPortalArns != null ? de_ArnList(output.associatedPortalArns, context) : undefined,
-        browserPolicy: __expectString(output.browserPolicy),
-        browserSettingsArn: __expectString(output.browserSettingsArn),
-    };
-};
-const de_BrowserSettingsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_BrowserSettingsSummary(entry, context);
-    });
-    return retVal;
-};
-const de_BrowserSettingsSummary = (output, context) => {
-    return {
-        browserSettingsArn: __expectString(output.browserSettingsArn),
-    };
-};
 const de_Certificate = (output, context) => {
-    return {
-        body: output.body != null ? context.base64Decoder(output.body) : undefined,
-        issuer: __expectString(output.issuer),
-        notValidAfter: output.notValidAfter != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.notValidAfter)))
-            : undefined,
-        notValidBefore: output.notValidBefore != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.notValidBefore)))
-            : undefined,
-        subject: __expectString(output.subject),
-        thumbprint: __expectString(output.thumbprint),
-    };
+    return take(output, {
+        body: context.base64Decoder,
+        issuer: __expectString,
+        notValidAfter: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        notValidBefore: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        subject: __expectString,
+        thumbprint: __expectString,
+    });
 };
 const de_CertificateSummary = (output, context) => {
-    return {
-        issuer: __expectString(output.issuer),
-        notValidAfter: output.notValidAfter != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.notValidAfter)))
-            : undefined,
-        notValidBefore: output.notValidBefore != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.notValidBefore)))
-            : undefined,
-        subject: __expectString(output.subject),
-        thumbprint: __expectString(output.thumbprint),
-    };
+    return take(output, {
+        issuer: __expectString,
+        notValidAfter: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        notValidBefore: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        subject: __expectString,
+        thumbprint: __expectString,
+    });
 };
 const de_CertificateSummaryList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_CertificateSummary(entry, context);
     });
     return retVal;
 };
-const de_IdentityProvider = (output, context) => {
-    return {
-        identityProviderArn: __expectString(output.identityProviderArn),
-        identityProviderDetails: output.identityProviderDetails != null
-            ? de_IdentityProviderDetails(output.identityProviderDetails, context)
-            : undefined,
-        identityProviderName: __expectString(output.identityProviderName),
-        identityProviderType: __expectString(output.identityProviderType),
-    };
-};
-const de_IdentityProviderDetails = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = __expectString(value);
-        return acc;
-    }, {});
-};
-const de_IdentityProviderList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_IdentityProviderSummary(entry, context);
-    });
-    return retVal;
-};
-const de_IdentityProviderSummary = (output, context) => {
-    return {
-        identityProviderArn: __expectString(output.identityProviderArn),
-        identityProviderName: __expectString(output.identityProviderName),
-        identityProviderType: __expectString(output.identityProviderType),
-    };
-};
-const de_NetworkSettings = (output, context) => {
-    return {
-        associatedPortalArns: output.associatedPortalArns != null ? de_ArnList(output.associatedPortalArns, context) : undefined,
-        networkSettingsArn: __expectString(output.networkSettingsArn),
-        securityGroupIds: output.securityGroupIds != null ? de_SecurityGroupIdList(output.securityGroupIds, context) : undefined,
-        subnetIds: output.subnetIds != null ? de_SubnetIdList(output.subnetIds, context) : undefined,
-        vpcId: __expectString(output.vpcId),
-    };
-};
-const de_NetworkSettingsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_NetworkSettingsSummary(entry, context);
-    });
-    return retVal;
-};
-const de_NetworkSettingsSummary = (output, context) => {
-    return {
-        networkSettingsArn: __expectString(output.networkSettingsArn),
-        vpcId: __expectString(output.vpcId),
-    };
-};
 const de_Portal = (output, context) => {
-    return {
-        authenticationType: __expectString(output.authenticationType),
-        browserSettingsArn: __expectString(output.browserSettingsArn),
-        browserType: __expectString(output.browserType),
-        creationDate: output.creationDate != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.creationDate)))
-            : undefined,
-        displayName: __expectString(output.displayName),
-        networkSettingsArn: __expectString(output.networkSettingsArn),
-        portalArn: __expectString(output.portalArn),
-        portalEndpoint: __expectString(output.portalEndpoint),
-        portalStatus: __expectString(output.portalStatus),
-        rendererType: __expectString(output.rendererType),
-        statusReason: __expectString(output.statusReason),
-        trustStoreArn: __expectString(output.trustStoreArn),
-        userAccessLoggingSettingsArn: __expectString(output.userAccessLoggingSettingsArn),
-        userSettingsArn: __expectString(output.userSettingsArn),
-    };
+    return take(output, {
+        authenticationType: __expectString,
+        browserSettingsArn: __expectString,
+        browserType: __expectString,
+        creationDate: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        displayName: __expectString,
+        networkSettingsArn: __expectString,
+        portalArn: __expectString,
+        portalEndpoint: __expectString,
+        portalStatus: __expectString,
+        rendererType: __expectString,
+        statusReason: __expectString,
+        trustStoreArn: __expectString,
+        userAccessLoggingSettingsArn: __expectString,
+        userSettingsArn: __expectString,
+    });
 };
 const de_PortalList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_PortalSummary(entry, context);
     });
     return retVal;
 };
 const de_PortalSummary = (output, context) => {
-    return {
-        authenticationType: __expectString(output.authenticationType),
-        browserSettingsArn: __expectString(output.browserSettingsArn),
-        browserType: __expectString(output.browserType),
-        creationDate: output.creationDate != null
-            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.creationDate)))
-            : undefined,
-        displayName: __expectString(output.displayName),
-        networkSettingsArn: __expectString(output.networkSettingsArn),
-        portalArn: __expectString(output.portalArn),
-        portalEndpoint: __expectString(output.portalEndpoint),
-        portalStatus: __expectString(output.portalStatus),
-        rendererType: __expectString(output.rendererType),
-        trustStoreArn: __expectString(output.trustStoreArn),
-        userAccessLoggingSettingsArn: __expectString(output.userAccessLoggingSettingsArn),
-        userSettingsArn: __expectString(output.userSettingsArn),
-    };
-};
-const de_SecurityGroupIdList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_SubnetIdList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
-const de_Tag = (output, context) => {
-    return {
-        Key: __expectString(output.Key),
-        Value: __expectString(output.Value),
-    };
-};
-const de_TagList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_Tag(entry, context);
-    });
-    return retVal;
-};
-const de_TrustStore = (output, context) => {
-    return {
-        associatedPortalArns: output.associatedPortalArns != null ? de_ArnList(output.associatedPortalArns, context) : undefined,
-        trustStoreArn: __expectString(output.trustStoreArn),
-    };
-};
-const de_TrustStoreSummary = (output, context) => {
-    return {
-        trustStoreArn: __expectString(output.trustStoreArn),
-    };
-};
-const de_TrustStoreSummaryList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_TrustStoreSummary(entry, context);
-    });
-    return retVal;
-};
-const de_UserAccessLoggingSettings = (output, context) => {
-    return {
-        associatedPortalArns: output.associatedPortalArns != null ? de_ArnList(output.associatedPortalArns, context) : undefined,
-        kinesisStreamArn: __expectString(output.kinesisStreamArn),
-        userAccessLoggingSettingsArn: __expectString(output.userAccessLoggingSettingsArn),
-    };
-};
-const de_UserAccessLoggingSettingsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_UserAccessLoggingSettingsSummary(entry, context);
-    });
-    return retVal;
-};
-const de_UserAccessLoggingSettingsSummary = (output, context) => {
-    return {
-        kinesisStreamArn: __expectString(output.kinesisStreamArn),
-        userAccessLoggingSettingsArn: __expectString(output.userAccessLoggingSettingsArn),
-    };
-};
-const de_UserSettings = (output, context) => {
-    return {
-        associatedPortalArns: output.associatedPortalArns != null ? de_ArnList(output.associatedPortalArns, context) : undefined,
-        copyAllowed: __expectString(output.copyAllowed),
-        disconnectTimeoutInMinutes: __expectInt32(output.disconnectTimeoutInMinutes),
-        downloadAllowed: __expectString(output.downloadAllowed),
-        idleDisconnectTimeoutInMinutes: __expectInt32(output.idleDisconnectTimeoutInMinutes),
-        pasteAllowed: __expectString(output.pasteAllowed),
-        printAllowed: __expectString(output.printAllowed),
-        uploadAllowed: __expectString(output.uploadAllowed),
-        userSettingsArn: __expectString(output.userSettingsArn),
-    };
-};
-const de_UserSettingsList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_UserSettingsSummary(entry, context);
+    return take(output, {
+        authenticationType: __expectString,
+        browserSettingsArn: __expectString,
+        browserType: __expectString,
+        creationDate: (_) => __expectNonNull(__parseEpochTimestamp(__expectNumber(_))),
+        displayName: __expectString,
+        networkSettingsArn: __expectString,
+        portalArn: __expectString,
+        portalEndpoint: __expectString,
+        portalStatus: __expectString,
+        rendererType: __expectString,
+        trustStoreArn: __expectString,
+        userAccessLoggingSettingsArn: __expectString,
+        userSettingsArn: __expectString,
     });
-    return retVal;
-};
-const de_UserSettingsSummary = (output, context) => {
-    return {
-        copyAllowed: __expectString(output.copyAllowed),
-        disconnectTimeoutInMinutes: __expectInt32(output.disconnectTimeoutInMinutes),
-        downloadAllowed: __expectString(output.downloadAllowed),
-        idleDisconnectTimeoutInMinutes: __expectInt32(output.idleDisconnectTimeoutInMinutes),
-        pasteAllowed: __expectString(output.pasteAllowed),
-        printAllowed: __expectString(output.printAllowed),
-        uploadAllowed: __expectString(output.uploadAllowed),
-        userSettingsArn: __expectString(output.userSettingsArn),
-    };
-};
-const de_ValidationExceptionField = (output, context) => {
-    return {
-        message: __expectString(output.message),
-        name: __expectString(output.name),
-    };
-};
-const de_ValidationExceptionFieldList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_ValidationExceptionField(entry, context);
-    });
-    return retVal;
 };
 const deserializeMetadata = (output) => ({
     httpStatusCode: output.statusCode,