@aws-sdk/client-tnb 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, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, map as __map, parseRfc3339DateTimeWithOffset as __parseRfc3339DateTimeWithOffset, resolvedPath as __resolvedPath, throwDefaultError, } from "@aws-sdk/smithy-client";
+import { _json, decorateServiceException as __decorateServiceException, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, map, parseRfc3339DateTimeWithOffset as __parseRfc3339DateTimeWithOffset, resolvedPath as __resolvedPath, take, withBaseException, } from "@aws-sdk/smithy-client";
 import { AccessDeniedException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, ValidationException, } from "../models/models_0";
 import { TnbServiceException as __BaseException } from "../models/TnbServiceException";
 export const se_CancelSolNetworkOperationCommand = async (input, context) => {
@@ -26,9 +26,9 @@ export const se_CreateSolFunctionPackageCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/sol/vnfpkgm/v1/vnf_packages";
     let body;
-    body = JSON.stringify({
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -46,12 +46,12 @@ export const se_CreateSolNetworkInstanceCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/sol/nslcm/v1/ns_instances";
     let body;
-    body = JSON.stringify({
-        ...(input.nsDescription != null && { nsDescription: input.nsDescription }),
-        ...(input.nsName != null && { nsName: input.nsName }),
-        ...(input.nsdInfoId != null && { nsdInfoId: input.nsdInfoId }),
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        nsDescription: [],
+        nsName: [],
+        nsdInfoId: [],
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -69,9 +69,9 @@ export const se_CreateSolNetworkPackageCommand = async (input, context) => {
     };
     const resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/sol/nsd/v1/ns_descriptors";
     let body;
-    body = JSON.stringify({
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -298,12 +298,10 @@ export const se_InstantiateSolNetworkInstanceCommand = async (input, context) =>
         dry_run: [() => input.dryRun !== void 0, () => input.dryRun.toString()],
     });
     let body;
-    body = JSON.stringify({
-        ...(input.additionalParamsForNs != null && {
-            additionalParamsForNs: se_Document(input.additionalParamsForNs, context),
-        }),
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        additionalParamsForNs: (_) => se_Document(_, context),
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -483,9 +481,9 @@ 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}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -505,9 +503,9 @@ export const se_TerminateSolNetworkInstanceCommand = async (input, context) => {
         "/sol/nslcm/v1/ns_instances/{nsInstanceId}/terminate";
     resolvedPath = __resolvedPath(resolvedPath, input, "nsInstanceId", () => input.nsInstanceId, "{nsInstanceId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-    });
+    body = JSON.stringify(take(input, {
+        tags: (_) => _json(_),
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -549,9 +547,9 @@ export const se_UpdateSolFunctionPackageCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/sol/vnfpkgm/v1/vnf_packages/{vnfPkgId}";
     resolvedPath = __resolvedPath(resolvedPath, input, "vnfPkgId", () => input.vnfPkgId, "{vnfPkgId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.operationalState != null && { operationalState: input.operationalState }),
-    });
+    body = JSON.stringify(take(input, {
+        operationalState: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -571,13 +569,11 @@ export const se_UpdateSolNetworkInstanceCommand = async (input, context) => {
         "/sol/nslcm/v1/ns_instances/{nsInstanceId}/update";
     resolvedPath = __resolvedPath(resolvedPath, input, "nsInstanceId", () => input.nsInstanceId, "{nsInstanceId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.modifyVnfInfoData != null && {
-            modifyVnfInfoData: se_UpdateSolNetworkModify(input.modifyVnfInfoData, context),
-        }),
-        ...(input.tags != null && { tags: se_TagMap(input.tags, context) }),
-        ...(input.updateType != null && { updateType: input.updateType }),
-    });
+    body = JSON.stringify(take(input, {
+        modifyVnfInfoData: (_) => se_UpdateSolNetworkModify(_, context),
+        tags: (_) => _json(_),
+        updateType: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -596,9 +592,9 @@ export const se_UpdateSolNetworkPackageCommand = async (input, context) => {
     let resolvedPath = `${basePath?.endsWith("/") ? basePath.slice(0, -1) : basePath || ""}` + "/sol/nsd/v1/ns_descriptors/{nsdInfoId}";
     resolvedPath = __resolvedPath(resolvedPath, input, "nsdInfoId", () => input.nsdInfoId, "{nsdInfoId}", false);
     let body;
-    body = JSON.stringify({
-        ...(input.nsdOperationalState != null && { nsdOperationalState: input.nsdOperationalState }),
-    });
+    body = JSON.stringify(take(input, {
+        nsdOperationalState: [],
+    }));
     return new __HttpRequest({
         protocol,
         hostname,
@@ -687,10 +683,9 @@ const de_CancelSolNetworkOperationCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -703,24 +698,15 @@ export const de_CreateSolFunctionPackageCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.onboardingState != null) {
-        contents.onboardingState = __expectString(data.onboardingState);
-    }
-    if (data.operationalState != null) {
-        contents.operationalState = __expectString(data.operationalState);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
-    if (data.usageState != null) {
-        contents.usageState = __expectString(data.usageState);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        onboardingState: __expectString,
+        operationalState: __expectString,
+        tags: _json,
+        usageState: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateSolFunctionPackageCommandError = async (output, context) => {
@@ -747,10 +733,9 @@ const de_CreateSolFunctionPackageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -763,21 +748,14 @@ export const de_CreateSolNetworkInstanceCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.nsInstanceName != null) {
-        contents.nsInstanceName = __expectString(data.nsInstanceName);
-    }
-    if (data.nsdInfoId != null) {
-        contents.nsdInfoId = __expectString(data.nsdInfoId);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        nsInstanceName: __expectString,
+        nsdInfoId: __expectString,
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateSolNetworkInstanceCommandError = async (output, context) => {
@@ -807,10 +785,9 @@ const de_CreateSolNetworkInstanceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -823,24 +800,15 @@ export const de_CreateSolNetworkPackageCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.nsdOnboardingState != null) {
-        contents.nsdOnboardingState = __expectString(data.nsdOnboardingState);
-    }
-    if (data.nsdOperationalState != null) {
-        contents.nsdOperationalState = __expectString(data.nsdOperationalState);
-    }
-    if (data.nsdUsageState != null) {
-        contents.nsdUsageState = __expectString(data.nsdUsageState);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        nsdOnboardingState: __expectString,
+        nsdOperationalState: __expectString,
+        nsdUsageState: __expectString,
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_CreateSolNetworkPackageCommandError = async (output, context) => {
@@ -867,10 +835,9 @@ const de_CreateSolNetworkPackageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -909,10 +876,9 @@ const de_DeleteSolFunctionPackageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -951,10 +917,9 @@ const de_DeleteSolNetworkInstanceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -993,10 +958,9 @@ const de_DeleteSolNetworkPackageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1009,42 +973,21 @@ export const de_GetSolFunctionInstanceCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.instantiatedVnfInfo != null) {
-        contents.instantiatedVnfInfo = de_GetSolVnfInfo(data.instantiatedVnfInfo, context);
-    }
-    if (data.instantiationState != null) {
-        contents.instantiationState = __expectString(data.instantiationState);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_GetSolFunctionInstanceMetadata(data.metadata, context);
-    }
-    if (data.nsInstanceId != null) {
-        contents.nsInstanceId = __expectString(data.nsInstanceId);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
-    if (data.vnfPkgId != null) {
-        contents.vnfPkgId = __expectString(data.vnfPkgId);
-    }
-    if (data.vnfProductName != null) {
-        contents.vnfProductName = __expectString(data.vnfProductName);
-    }
-    if (data.vnfProvider != null) {
-        contents.vnfProvider = __expectString(data.vnfProvider);
-    }
-    if (data.vnfdId != null) {
-        contents.vnfdId = __expectString(data.vnfdId);
-    }
-    if (data.vnfdVersion != null) {
-        contents.vnfdVersion = __expectString(data.vnfdVersion);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        instantiatedVnfInfo: _json,
+        instantiationState: __expectString,
+        metadata: (_) => de_GetSolFunctionInstanceMetadata(_, context),
+        nsInstanceId: __expectString,
+        tags: _json,
+        vnfPkgId: __expectString,
+        vnfProductName: __expectString,
+        vnfProvider: __expectString,
+        vnfdId: __expectString,
+        vnfdVersion: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetSolFunctionInstanceCommandError = async (output, context) => {
@@ -1071,10 +1014,9 @@ const de_GetSolFunctionInstanceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1087,39 +1029,20 @@ export const de_GetSolFunctionPackageCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_GetSolFunctionPackageMetadata(data.metadata, context);
-    }
-    if (data.onboardingState != null) {
-        contents.onboardingState = __expectString(data.onboardingState);
-    }
-    if (data.operationalState != null) {
-        contents.operationalState = __expectString(data.operationalState);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
-    if (data.usageState != null) {
-        contents.usageState = __expectString(data.usageState);
-    }
-    if (data.vnfProductName != null) {
-        contents.vnfProductName = __expectString(data.vnfProductName);
-    }
-    if (data.vnfProvider != null) {
-        contents.vnfProvider = __expectString(data.vnfProvider);
-    }
-    if (data.vnfdId != null) {
-        contents.vnfdId = __expectString(data.vnfdId);
-    }
-    if (data.vnfdVersion != null) {
-        contents.vnfdVersion = __expectString(data.vnfdVersion);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        metadata: (_) => de_GetSolFunctionPackageMetadata(_, context),
+        onboardingState: __expectString,
+        operationalState: __expectString,
+        tags: _json,
+        usageState: __expectString,
+        vnfProductName: __expectString,
+        vnfProvider: __expectString,
+        vnfdId: __expectString,
+        vnfdVersion: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetSolFunctionPackageCommandError = async (output, context) => {
@@ -1146,10 +1069,9 @@ const de_GetSolFunctionPackageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1190,10 +1112,9 @@ const de_GetSolFunctionPackageContentCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1234,10 +1155,9 @@ const de_GetSolFunctionPackageDescriptorCommandError = async (output, context) =
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1250,36 +1170,19 @@ export const de_GetSolNetworkInstanceCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.lcmOpInfo != null) {
-        contents.lcmOpInfo = de_LcmOperationInfo(data.lcmOpInfo, context);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_GetSolNetworkInstanceMetadata(data.metadata, context);
-    }
-    if (data.nsInstanceDescription != null) {
-        contents.nsInstanceDescription = __expectString(data.nsInstanceDescription);
-    }
-    if (data.nsInstanceName != null) {
-        contents.nsInstanceName = __expectString(data.nsInstanceName);
-    }
-    if (data.nsState != null) {
-        contents.nsState = __expectString(data.nsState);
-    }
-    if (data.nsdId != null) {
-        contents.nsdId = __expectString(data.nsdId);
-    }
-    if (data.nsdInfoId != null) {
-        contents.nsdInfoId = __expectString(data.nsdInfoId);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        lcmOpInfo: _json,
+        metadata: (_) => de_GetSolNetworkInstanceMetadata(_, context),
+        nsInstanceDescription: __expectString,
+        nsInstanceName: __expectString,
+        nsState: __expectString,
+        nsdId: __expectString,
+        nsdInfoId: __expectString,
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetSolNetworkInstanceCommandError = async (output, context) => {
@@ -1306,10 +1209,9 @@ const de_GetSolNetworkInstanceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1322,33 +1224,18 @@ export const de_GetSolNetworkOperationCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.error != null) {
-        contents.error = de_ProblemDetails(data.error, context);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.lcmOperationType != null) {
-        contents.lcmOperationType = __expectString(data.lcmOperationType);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_GetSolNetworkOperationMetadata(data.metadata, context);
-    }
-    if (data.nsInstanceId != null) {
-        contents.nsInstanceId = __expectString(data.nsInstanceId);
-    }
-    if (data.operationState != null) {
-        contents.operationState = __expectString(data.operationState);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
-    if (data.tasks != null) {
-        contents.tasks = de_GetSolNetworkOperationTasksList(data.tasks, context);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        error: _json,
+        id: __expectString,
+        lcmOperationType: __expectString,
+        metadata: (_) => de_GetSolNetworkOperationMetadata(_, context),
+        nsInstanceId: __expectString,
+        operationState: __expectString,
+        tags: _json,
+        tasks: (_) => de_GetSolNetworkOperationTasksList(_, context),
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetSolNetworkOperationCommandError = async (output, context) => {
@@ -1375,10 +1262,9 @@ const de_GetSolNetworkOperationCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1391,39 +1277,20 @@ export const de_GetSolNetworkPackageCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_GetSolNetworkPackageMetadata(data.metadata, context);
-    }
-    if (data.nsdId != null) {
-        contents.nsdId = __expectString(data.nsdId);
-    }
-    if (data.nsdName != null) {
-        contents.nsdName = __expectString(data.nsdName);
-    }
-    if (data.nsdOnboardingState != null) {
-        contents.nsdOnboardingState = __expectString(data.nsdOnboardingState);
-    }
-    if (data.nsdOperationalState != null) {
-        contents.nsdOperationalState = __expectString(data.nsdOperationalState);
-    }
-    if (data.nsdUsageState != null) {
-        contents.nsdUsageState = __expectString(data.nsdUsageState);
-    }
-    if (data.nsdVersion != null) {
-        contents.nsdVersion = __expectString(data.nsdVersion);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
-    if (data.vnfPkgIds != null) {
-        contents.vnfPkgIds = de_VnfPkgIdList(data.vnfPkgIds, context);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        metadata: (_) => de_GetSolNetworkPackageMetadata(_, context),
+        nsdId: __expectString,
+        nsdName: __expectString,
+        nsdOnboardingState: __expectString,
+        nsdOperationalState: __expectString,
+        nsdUsageState: __expectString,
+        nsdVersion: __expectString,
+        tags: _json,
+        vnfPkgIds: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_GetSolNetworkPackageCommandError = async (output, context) => {
@@ -1450,10 +1317,9 @@ const de_GetSolNetworkPackageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1494,10 +1360,9 @@ const de_GetSolNetworkPackageContentCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1538,10 +1403,9 @@ const de_GetSolNetworkPackageDescriptorCommandError = async (output, context) =>
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1554,12 +1418,11 @@ export const de_InstantiateSolNetworkInstanceCommand = async (output, context) =
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nsLcmOpOccId != null) {
-        contents.nsLcmOpOccId = __expectString(data.nsLcmOpOccId);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
+    const doc = take(data, {
+        nsLcmOpOccId: __expectString,
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_InstantiateSolNetworkInstanceCommandError = async (output, context) => {
@@ -1589,10 +1452,9 @@ const de_InstantiateSolNetworkInstanceCommandError = async (output, context) =>
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1605,12 +1467,11 @@ export const de_ListSolFunctionInstancesCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.functionInstances != null) {
-        contents.functionInstances = de_ListSolFunctionInstanceResources(data.functionInstances, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        functionInstances: (_) => de_ListSolFunctionInstanceResources(_, context),
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListSolFunctionInstancesCommandError = async (output, context) => {
@@ -1634,10 +1495,9 @@ const de_ListSolFunctionInstancesCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1650,12 +1510,11 @@ export const de_ListSolFunctionPackagesCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.functionPackages != null) {
-        contents.functionPackages = de_ListSolFunctionPackageResources(data.functionPackages, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        functionPackages: (_) => de_ListSolFunctionPackageResources(_, context),
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListSolFunctionPackagesCommandError = async (output, context) => {
@@ -1679,10 +1538,9 @@ const de_ListSolFunctionPackagesCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1695,12 +1553,11 @@ export const de_ListSolNetworkInstancesCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.networkInstances != null) {
-        contents.networkInstances = de_ListSolNetworkInstanceResources(data.networkInstances, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        networkInstances: (_) => de_ListSolNetworkInstanceResources(_, context),
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListSolNetworkInstancesCommandError = async (output, context) => {
@@ -1724,10 +1581,9 @@ const de_ListSolNetworkInstancesCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1740,12 +1596,11 @@ export const de_ListSolNetworkOperationsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.networkOperations != null) {
-        contents.networkOperations = de_ListSolNetworkOperationsResources(data.networkOperations, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        networkOperations: (_) => de_ListSolNetworkOperationsResources(_, context),
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListSolNetworkOperationsCommandError = async (output, context) => {
@@ -1769,10 +1624,9 @@ const de_ListSolNetworkOperationsCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1785,12 +1639,11 @@ export const de_ListSolNetworkPackagesCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.networkPackages != null) {
-        contents.networkPackages = de_ListSolNetworkPackageResources(data.networkPackages, context);
-    }
-    if (data.nextToken != null) {
-        contents.nextToken = __expectString(data.nextToken);
-    }
+    const doc = take(data, {
+        networkPackages: (_) => de_ListSolNetworkPackageResources(_, context),
+        nextToken: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListSolNetworkPackagesCommandError = async (output, context) => {
@@ -1814,10 +1667,9 @@ const de_ListSolNetworkPackagesCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1830,9 +1682,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_TagMap(data.tags, context);
-    }
+    const doc = take(data, {
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ListTagsForResourceCommandError = async (output, context) => {
@@ -1859,10 +1712,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,
             });
     }
@@ -1875,24 +1727,15 @@ export const de_PutSolFunctionPackageContentCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_PutSolFunctionPackageContentMetadata(data.metadata, context);
-    }
-    if (data.vnfProductName != null) {
-        contents.vnfProductName = __expectString(data.vnfProductName);
-    }
-    if (data.vnfProvider != null) {
-        contents.vnfProvider = __expectString(data.vnfProvider);
-    }
-    if (data.vnfdId != null) {
-        contents.vnfdId = __expectString(data.vnfdId);
-    }
-    if (data.vnfdVersion != null) {
-        contents.vnfdVersion = __expectString(data.vnfdVersion);
-    }
+    const doc = take(data, {
+        id: __expectString,
+        metadata: _json,
+        vnfProductName: __expectString,
+        vnfProvider: __expectString,
+        vnfdId: __expectString,
+        vnfdVersion: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_PutSolFunctionPackageContentCommandError = async (output, context) => {
@@ -1919,10 +1762,9 @@ const de_PutSolFunctionPackageContentCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -1935,27 +1777,16 @@ export const de_PutSolNetworkPackageContentCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_PutSolNetworkPackageContentMetadata(data.metadata, context);
-    }
-    if (data.nsdId != null) {
-        contents.nsdId = __expectString(data.nsdId);
-    }
-    if (data.nsdName != null) {
-        contents.nsdName = __expectString(data.nsdName);
-    }
-    if (data.nsdVersion != null) {
-        contents.nsdVersion = __expectString(data.nsdVersion);
-    }
-    if (data.vnfPkgIds != null) {
-        contents.vnfPkgIds = de_VnfPkgIdList(data.vnfPkgIds, context);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        metadata: _json,
+        nsdId: __expectString,
+        nsdName: __expectString,
+        nsdVersion: __expectString,
+        vnfPkgIds: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_PutSolNetworkPackageContentCommandError = async (output, context) => {
@@ -1982,10 +1813,9 @@ const de_PutSolNetworkPackageContentCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2024,10 +1854,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,
             });
     }
@@ -2040,12 +1869,11 @@ export const de_TerminateSolNetworkInstanceCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nsLcmOpOccId != null) {
-        contents.nsLcmOpOccId = __expectString(data.nsLcmOpOccId);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
+    const doc = take(data, {
+        nsLcmOpOccId: __expectString,
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_TerminateSolNetworkInstanceCommandError = async (output, context) => {
@@ -2075,10 +1903,9 @@ const de_TerminateSolNetworkInstanceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2117,10 +1944,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,
             });
     }
@@ -2133,9 +1959,10 @@ export const de_UpdateSolFunctionPackageCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.operationalState != null) {
-        contents.operationalState = __expectString(data.operationalState);
-    }
+    const doc = take(data, {
+        operationalState: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateSolFunctionPackageCommandError = async (output, context) => {
@@ -2162,10 +1989,9 @@ const de_UpdateSolFunctionPackageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2178,12 +2004,11 @@ export const de_UpdateSolNetworkInstanceCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nsLcmOpOccId != null) {
-        contents.nsLcmOpOccId = __expectString(data.nsLcmOpOccId);
-    }
-    if (data.tags != null) {
-        contents.tags = de_TagMap(data.tags, context);
-    }
+    const doc = take(data, {
+        nsLcmOpOccId: __expectString,
+        tags: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateSolNetworkInstanceCommandError = async (output, context) => {
@@ -2213,10 +2038,9 @@ const de_UpdateSolNetworkInstanceCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2229,9 +2053,10 @@ export const de_UpdateSolNetworkPackageCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.nsdOperationalState != null) {
-        contents.nsdOperationalState = __expectString(data.nsdOperationalState);
-    }
+    const doc = take(data, {
+        nsdOperationalState: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_UpdateSolNetworkPackageCommandError = async (output, context) => {
@@ -2258,10 +2083,9 @@ const de_UpdateSolNetworkPackageCommandError = async (output, context) => {
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2274,24 +2098,15 @@ export const de_ValidateSolFunctionPackageContentCommand = async (output, contex
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_ValidateSolFunctionPackageContentMetadata(data.metadata, context);
-    }
-    if (data.vnfProductName != null) {
-        contents.vnfProductName = __expectString(data.vnfProductName);
-    }
-    if (data.vnfProvider != null) {
-        contents.vnfProvider = __expectString(data.vnfProvider);
-    }
-    if (data.vnfdId != null) {
-        contents.vnfdId = __expectString(data.vnfdId);
-    }
-    if (data.vnfdVersion != null) {
-        contents.vnfdVersion = __expectString(data.vnfdVersion);
-    }
+    const doc = take(data, {
+        id: __expectString,
+        metadata: _json,
+        vnfProductName: __expectString,
+        vnfProvider: __expectString,
+        vnfdId: __expectString,
+        vnfdVersion: __expectString,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ValidateSolFunctionPackageContentCommandError = async (output, context) => {
@@ -2318,10 +2133,9 @@ const de_ValidateSolFunctionPackageContentCommandError = async (output, context)
             throw await de_ValidationExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            throwDefaultError({
+            return throwDefaultError({
                 output,
                 parsedBody,
-                exceptionCtor: __BaseException,
                 errorCode,
             });
     }
@@ -2334,27 +2148,16 @@ export const de_ValidateSolNetworkPackageContentCommand = async (output, context
         $metadata: deserializeMetadata(output),
     });
     const data = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
-    if (data.arn != null) {
-        contents.arn = __expectString(data.arn);
-    }
-    if (data.id != null) {
-        contents.id = __expectString(data.id);
-    }
-    if (data.metadata != null) {
-        contents.metadata = de_ValidateSolNetworkPackageContentMetadata(data.metadata, context);
-    }
-    if (data.nsdId != null) {
-        contents.nsdId = __expectString(data.nsdId);
-    }
-    if (data.nsdName != null) {
-        contents.nsdName = __expectString(data.nsdName);
-    }
-    if (data.nsdVersion != null) {
-        contents.nsdVersion = __expectString(data.nsdVersion);
-    }
-    if (data.vnfPkgIds != null) {
-        contents.vnfPkgIds = de_VnfPkgIdList(data.vnfPkgIds, context);
-    }
+    const doc = take(data, {
+        arn: __expectString,
+        id: __expectString,
+        metadata: _json,
+        nsdId: __expectString,
+        nsdName: __expectString,
+        nsdVersion: __expectString,
+        vnfPkgIds: _json,
+    });
+    Object.assign(contents, doc);
     return contents;
 };
 const de_ValidateSolNetworkPackageContentCommandError = async (output, context) => {
@@ -2381,21 +2184,21 @@ const de_ValidateSolNetworkPackageContentCommandError = 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,
@@ -2405,9 +2208,10 @@ const de_AccessDeniedExceptionRes = async (parsedOutput, context) => {
 const de_InternalServerExceptionRes = 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 InternalServerException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2417,9 +2221,10 @@ 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);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ResourceNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2429,9 +2234,10 @@ 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);
-    }
+    const doc = take(data, {
+        message: __expectString,
+    });
+    Object.assign(contents, doc);
     const exception = new ServiceQuotaExceededException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2441,9 +2247,10 @@ const de_ServiceQuotaExceededExceptionRes = async (parsedOutput, context) => {
 const de_ThrottlingExceptionRes = 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 ThrottlingException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
@@ -2453,369 +2260,210 @@ const de_ThrottlingExceptionRes = async (parsedOutput, context) => {
 const de_ValidationExceptionRes = 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 ValidationException({
         $metadata: deserializeMetadata(parsedOutput),
         ...contents,
     });
     return __decorateServiceException(exception, parsedOutput.body);
 };
-const se_TagMap = (input, context) => {
-    return Object.entries(input).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = value;
-        return acc;
-    }, {});
-};
 const se_UpdateSolNetworkModify = (input, context) => {
-    return {
-        ...(input.vnfConfigurableProperties != null && {
-            vnfConfigurableProperties: se_Document(input.vnfConfigurableProperties, context),
-        }),
-        ...(input.vnfInstanceId != null && { vnfInstanceId: input.vnfInstanceId }),
-    };
+    return take(input, {
+        vnfConfigurableProperties: (_) => se_Document(_, context),
+        vnfInstanceId: [],
+    });
 };
 const se_Document = (input, context) => {
     return input;
 };
-const de_ErrorInfo = (output, context) => {
-    return {
-        cause: __expectString(output.cause),
-        details: __expectString(output.details),
-    };
-};
-const de_FunctionArtifactMeta = (output, context) => {
-    return {
-        overrides: output.overrides != null ? de_OverrideList(output.overrides, context) : undefined,
-    };
-};
 const de_GetSolFunctionInstanceMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    });
 };
 const de_GetSolFunctionPackageMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-        vnfd: output.vnfd != null ? de_FunctionArtifactMeta(output.vnfd, context) : undefined,
-    };
-};
-const de_GetSolInstantiatedVnfInfo = (output, context) => {
-    return {
-        vnfState: __expectString(output.vnfState),
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        vnfd: _json,
+    });
 };
 const de_GetSolNetworkInstanceMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    });
 };
 const de_GetSolNetworkOperationMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    });
 };
 const de_GetSolNetworkOperationTaskDetails = (output, context) => {
-    return {
-        taskContext: output.taskContext != null ? de_StringMap(output.taskContext, context) : undefined,
-        taskEndTime: output.taskEndTime != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.taskEndTime)) : undefined,
-        taskErrorDetails: output.taskErrorDetails != null ? de_ErrorInfo(output.taskErrorDetails, context) : undefined,
-        taskName: __expectString(output.taskName),
-        taskStartTime: output.taskStartTime != null
-            ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.taskStartTime))
-            : undefined,
-        taskStatus: __expectString(output.taskStatus),
-    };
+    return take(output, {
+        taskContext: _json,
+        taskEndTime: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        taskErrorDetails: _json,
+        taskName: __expectString,
+        taskStartTime: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        taskStatus: __expectString,
+    });
 };
 const de_GetSolNetworkOperationTasksList = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_GetSolNetworkOperationTaskDetails(entry, context);
     });
     return retVal;
 };
 const de_GetSolNetworkPackageMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-        nsd: output.nsd != null ? de_NetworkArtifactMeta(output.nsd, context) : undefined,
-    };
-};
-const de_GetSolVnfcResourceInfo = (output, context) => {
-    return {
-        metadata: output.metadata != null ? de_GetSolVnfcResourceInfoMetadata(output.metadata, context) : undefined,
-    };
-};
-const de_GetSolVnfcResourceInfoList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_GetSolVnfcResourceInfo(entry, context);
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        nsd: _json,
     });
-    return retVal;
-};
-const de_GetSolVnfcResourceInfoMetadata = (output, context) => {
-    return {
-        cluster: __expectString(output.cluster),
-        helmChart: __expectString(output.helmChart),
-        nodeGroup: __expectString(output.nodeGroup),
-    };
-};
-const de_GetSolVnfInfo = (output, context) => {
-    return {
-        vnfState: __expectString(output.vnfState),
-        vnfcResourceInfo: output.vnfcResourceInfo != null ? de_GetSolVnfcResourceInfoList(output.vnfcResourceInfo, context) : undefined,
-    };
-};
-const de_LcmOperationInfo = (output, context) => {
-    return {
-        nsLcmOpOccId: __expectString(output.nsLcmOpOccId),
-    };
 };
 const de_ListSolFunctionInstanceInfo = (output, context) => {
-    return {
-        arn: __expectString(output.arn),
-        id: __expectString(output.id),
-        instantiatedVnfInfo: output.instantiatedVnfInfo != null
-            ? de_GetSolInstantiatedVnfInfo(output.instantiatedVnfInfo, context)
-            : undefined,
-        instantiationState: __expectString(output.instantiationState),
-        metadata: output.metadata != null ? de_ListSolFunctionInstanceMetadata(output.metadata, context) : undefined,
-        nsInstanceId: __expectString(output.nsInstanceId),
-        vnfPkgId: __expectString(output.vnfPkgId),
-        vnfPkgName: __expectString(output.vnfPkgName),
-    };
+    return take(output, {
+        arn: __expectString,
+        id: __expectString,
+        instantiatedVnfInfo: _json,
+        instantiationState: __expectString,
+        metadata: (_) => de_ListSolFunctionInstanceMetadata(_, context),
+        nsInstanceId: __expectString,
+        vnfPkgId: __expectString,
+        vnfPkgName: __expectString,
+    });
 };
 const de_ListSolFunctionInstanceMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    });
 };
 const de_ListSolFunctionInstanceResources = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_ListSolFunctionInstanceInfo(entry, context);
     });
     return retVal;
 };
 const de_ListSolFunctionPackageInfo = (output, context) => {
-    return {
-        arn: __expectString(output.arn),
-        id: __expectString(output.id),
-        metadata: output.metadata != null ? de_ListSolFunctionPackageMetadata(output.metadata, context) : undefined,
-        onboardingState: __expectString(output.onboardingState),
-        operationalState: __expectString(output.operationalState),
-        usageState: __expectString(output.usageState),
-        vnfProductName: __expectString(output.vnfProductName),
-        vnfProvider: __expectString(output.vnfProvider),
-        vnfdId: __expectString(output.vnfdId),
-        vnfdVersion: __expectString(output.vnfdVersion),
-    };
+    return take(output, {
+        arn: __expectString,
+        id: __expectString,
+        metadata: (_) => de_ListSolFunctionPackageMetadata(_, context),
+        onboardingState: __expectString,
+        operationalState: __expectString,
+        usageState: __expectString,
+        vnfProductName: __expectString,
+        vnfProvider: __expectString,
+        vnfdId: __expectString,
+        vnfdVersion: __expectString,
+    });
 };
 const de_ListSolFunctionPackageMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    });
 };
 const de_ListSolFunctionPackageResources = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_ListSolFunctionPackageInfo(entry, context);
     });
     return retVal;
 };
 const de_ListSolNetworkInstanceInfo = (output, context) => {
-    return {
-        arn: __expectString(output.arn),
-        id: __expectString(output.id),
-        metadata: output.metadata != null ? de_ListSolNetworkInstanceMetadata(output.metadata, context) : undefined,
-        nsInstanceDescription: __expectString(output.nsInstanceDescription),
-        nsInstanceName: __expectString(output.nsInstanceName),
-        nsState: __expectString(output.nsState),
-        nsdId: __expectString(output.nsdId),
-        nsdInfoId: __expectString(output.nsdInfoId),
-    };
+    return take(output, {
+        arn: __expectString,
+        id: __expectString,
+        metadata: (_) => de_ListSolNetworkInstanceMetadata(_, context),
+        nsInstanceDescription: __expectString,
+        nsInstanceName: __expectString,
+        nsState: __expectString,
+        nsdId: __expectString,
+        nsdInfoId: __expectString,
+    });
 };
 const de_ListSolNetworkInstanceMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    });
 };
 const de_ListSolNetworkInstanceResources = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_ListSolNetworkInstanceInfo(entry, context);
     });
     return retVal;
 };
 const de_ListSolNetworkOperationsInfo = (output, context) => {
-    return {
-        arn: __expectString(output.arn),
-        error: output.error != null ? de_ProblemDetails(output.error, context) : undefined,
-        id: __expectString(output.id),
-        lcmOperationType: __expectString(output.lcmOperationType),
-        metadata: output.metadata != null ? de_ListSolNetworkOperationsMetadata(output.metadata, context) : undefined,
-        nsInstanceId: __expectString(output.nsInstanceId),
-        operationState: __expectString(output.operationState),
-    };
+    return take(output, {
+        arn: __expectString,
+        error: _json,
+        id: __expectString,
+        lcmOperationType: __expectString,
+        metadata: (_) => de_ListSolNetworkOperationsMetadata(_, context),
+        nsInstanceId: __expectString,
+        operationState: __expectString,
+    });
 };
 const de_ListSolNetworkOperationsMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    });
 };
 const de_ListSolNetworkOperationsResources = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_ListSolNetworkOperationsInfo(entry, context);
     });
     return retVal;
 };
 const de_ListSolNetworkPackageInfo = (output, context) => {
-    return {
-        arn: __expectString(output.arn),
-        id: __expectString(output.id),
-        metadata: output.metadata != null ? de_ListSolNetworkPackageMetadata(output.metadata, context) : undefined,
-        nsdDesigner: __expectString(output.nsdDesigner),
-        nsdId: __expectString(output.nsdId),
-        nsdInvariantId: __expectString(output.nsdInvariantId),
-        nsdName: __expectString(output.nsdName),
-        nsdOnboardingState: __expectString(output.nsdOnboardingState),
-        nsdOperationalState: __expectString(output.nsdOperationalState),
-        nsdUsageState: __expectString(output.nsdUsageState),
-        nsdVersion: __expectString(output.nsdVersion),
-        vnfPkgIds: output.vnfPkgIds != null ? de_VnfPkgIdList(output.vnfPkgIds, context) : undefined,
-    };
+    return take(output, {
+        arn: __expectString,
+        id: __expectString,
+        metadata: (_) => de_ListSolNetworkPackageMetadata(_, context),
+        nsdDesigner: __expectString,
+        nsdId: __expectString,
+        nsdInvariantId: __expectString,
+        nsdName: __expectString,
+        nsdOnboardingState: __expectString,
+        nsdOperationalState: __expectString,
+        nsdUsageState: __expectString,
+        nsdVersion: __expectString,
+        vnfPkgIds: _json,
+    });
 };
 const de_ListSolNetworkPackageMetadata = (output, context) => {
-    return {
-        createdAt: output.createdAt != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.createdAt)) : undefined,
-        lastModified: output.lastModified != null ? __expectNonNull(__parseRfc3339DateTimeWithOffset(output.lastModified)) : undefined,
-    };
+    return take(output, {
+        createdAt: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+        lastModified: (_) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    });
 };
 const de_ListSolNetworkPackageResources = (output, context) => {
     const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return de_ListSolNetworkPackageInfo(entry, context);
     });
     return retVal;
 };
-const de_NetworkArtifactMeta = (output, context) => {
-    return {
-        overrides: output.overrides != null ? de_OverrideList(output.overrides, context) : undefined,
-    };
-};
-const de_OverrideList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return de_ToscaOverride(entry, context);
-    });
-    return retVal;
-};
-const de_ProblemDetails = (output, context) => {
-    return {
-        detail: __expectString(output.detail),
-        title: __expectString(output.title),
-    };
-};
-const de_PutSolFunctionPackageContentMetadata = (output, context) => {
-    return {
-        vnfd: output.vnfd != null ? de_FunctionArtifactMeta(output.vnfd, context) : undefined,
-    };
-};
-const de_PutSolNetworkPackageContentMetadata = (output, context) => {
-    return {
-        nsd: output.nsd != null ? de_NetworkArtifactMeta(output.nsd, context) : undefined,
-    };
-};
-const de_StringMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = __expectString(value);
-        return acc;
-    }, {});
-};
-const de_TagMap = (output, context) => {
-    return Object.entries(output).reduce((acc, [key, value]) => {
-        if (value === null) {
-            return acc;
-        }
-        acc[key] = __expectString(value);
-        return acc;
-    }, {});
-};
-const de_ToscaOverride = (output, context) => {
-    return {
-        defaultValue: __expectString(output.defaultValue),
-        name: __expectString(output.name),
-    };
-};
-const de_ValidateSolFunctionPackageContentMetadata = (output, context) => {
-    return {
-        vnfd: output.vnfd != null ? de_FunctionArtifactMeta(output.vnfd, context) : undefined,
-    };
-};
-const de_ValidateSolNetworkPackageContentMetadata = (output, context) => {
-    return {
-        nsd: output.nsd != null ? de_NetworkArtifactMeta(output.nsd, context) : undefined,
-    };
-};
-const de_VnfPkgIdList = (output, context) => {
-    const retVal = (output || [])
-        .filter((e) => e != null)
-        .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
-        return __expectString(entry);
-    });
-    return retVal;
-};
 const deserializeMetadata = (output) => ({
     httpStatusCode: output.statusCode,
     requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"] ?? output.headers["x-amz-request-id"],