@aws-sdk/client-migrationhubstrategy 3.131.0 → 3.142.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,10 +1,10 @@
 import { __assign, __awaiter, __generator } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, expectUnion as __expectUnion, extendedEncodeURIComponent as __extendedEncodeURIComponent, parseEpochTimestamp as __parseEpochTimestamp, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, expectUnion as __expectUnion, map as __map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { MigrationHubStrategyServiceException as __BaseException } from "../models/MigrationHubStrategyServiceException";
 import { AccessDeniedException, ConflictException, DatabaseMigrationPreference, InternalServerException, ManagementPreference, ResourceNotFoundException, ServiceLinkedRoleLockClientException, ServiceQuotaExceededException, ThrottlingException, ValidationException, } from "../models/models_0";
 export var serializeAws_restJson1GetApplicationComponentDetailsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -13,16 +13,7 @@ export var serializeAws_restJson1GetApplicationComponentDetailsCommand = functio
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/get-applicationcomponent-details/{applicationComponentId}";
-                if (input.applicationComponentId !== undefined) {
-                    labelValue = input.applicationComponentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: applicationComponentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{applicationComponentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: applicationComponentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "applicationComponentId", function () { return input.applicationComponentId; }, "{applicationComponentId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -36,7 +27,7 @@ export var serializeAws_restJson1GetApplicationComponentDetailsCommand = functio
     });
 }); };
 export var serializeAws_restJson1GetApplicationComponentStrategiesCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -45,16 +36,7 @@ export var serializeAws_restJson1GetApplicationComponentStrategiesCommand = func
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/get-applicationcomponent-strategies/{applicationComponentId}";
-                if (input.applicationComponentId !== undefined) {
-                    labelValue = input.applicationComponentId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: applicationComponentId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{applicationComponentId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: applicationComponentId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "applicationComponentId", function () { return input.applicationComponentId; }, "{applicationComponentId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -68,7 +50,7 @@ export var serializeAws_restJson1GetApplicationComponentStrategiesCommand = func
     });
 }); };
 export var serializeAws_restJson1GetAssessmentCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -76,16 +58,7 @@ export var serializeAws_restJson1GetAssessmentCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/get-assessment/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -99,7 +72,7 @@ export var serializeAws_restJson1GetAssessmentCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1GetImportFileTaskCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -107,16 +80,7 @@ export var serializeAws_restJson1GetImportFileTaskCommand = function (input, con
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/get-import-file-task/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -178,7 +142,7 @@ export var serializeAws_restJson1GetPortfolioSummaryCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1GetRecommendationReportDetailsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -186,16 +150,7 @@ export var serializeAws_restJson1GetRecommendationReportDetailsCommand = functio
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/get-recommendation-report-details/{id}";
-                if (input.id !== undefined) {
-                    labelValue = input.id;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: id.");
-                    }
-                    resolvedPath = resolvedPath.replace("{id}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: id.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "id", function () { return input.id; }, "{id}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -209,7 +164,7 @@ export var serializeAws_restJson1GetRecommendationReportDetailsCommand = functio
     });
 }); };
 export var serializeAws_restJson1GetServerDetailsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -217,17 +172,11 @@ export var serializeAws_restJson1GetServerDetailsCommand = function (input, cont
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/get-server-details/{serverId}";
-                if (input.serverId !== undefined) {
-                    labelValue = input.serverId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: serverId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{serverId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: serverId.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "serverId", function () { return input.serverId; }, "{serverId}", false);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -242,7 +191,7 @@ export var serializeAws_restJson1GetServerDetailsCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1GetServerStrategiesCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -250,16 +199,7 @@ export var serializeAws_restJson1GetServerStrategiesCommand = function (input, c
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/get-server-strategies/{serverId}";
-                if (input.serverId !== undefined) {
-                    labelValue = input.serverId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: serverId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{serverId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: serverId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "serverId", function () { return input.serverId; }, "{serverId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -307,7 +247,10 @@ export var serializeAws_restJson1ListCollectorsCommand = function (input, contex
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/list-collectors";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -330,7 +273,10 @@ export var serializeAws_restJson1ListImportFileTaskCommand = function (input, co
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/list-import-file-task";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -556,36 +502,32 @@ export var deserializeAws_restJson1GetApplicationComponentDetailsCommand = funct
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetApplicationComponentDetailsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    applicationComponentDetail: undefined,
-                    associatedApplications: undefined,
-                    associatedServerIds: undefined,
-                    moreApplicationResource: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.applicationComponentDetail !== undefined && data.applicationComponentDetail !== null) {
+                if (data.applicationComponentDetail != null) {
                     contents.applicationComponentDetail = deserializeAws_restJson1ApplicationComponentDetail(data.applicationComponentDetail, context);
                 }
-                if (data.associatedApplications !== undefined && data.associatedApplications !== null) {
+                if (data.associatedApplications != null) {
                     contents.associatedApplications = deserializeAws_restJson1AssociatedApplications(data.associatedApplications, context);
                 }
-                if (data.associatedServerIds !== undefined && data.associatedServerIds !== null) {
+                if (data.associatedServerIds != null) {
                     contents.associatedServerIds = deserializeAws_restJson1AssociatedServerIDs(data.associatedServerIds, context);
                 }
-                if (data.moreApplicationResource !== undefined && data.moreApplicationResource !== null) {
+                if (data.moreApplicationResource != null) {
                     contents.moreApplicationResource = __expectBoolean(data.moreApplicationResource);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetApplicationComponentDetailsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -614,14 +556,14 @@ var deserializeAws_restJson1GetApplicationComponentDetailsCommandError = functio
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -633,24 +575,23 @@ export var deserializeAws_restJson1GetApplicationComponentStrategiesCommand = fu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetApplicationComponentStrategiesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    applicationComponentStrategies: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.applicationComponentStrategies !== undefined && data.applicationComponentStrategies !== null) {
+                if (data.applicationComponentStrategies != null) {
                     contents.applicationComponentStrategies = deserializeAws_restJson1ApplicationComponentStrategies(data.applicationComponentStrategies, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetApplicationComponentStrategiesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -679,14 +620,14 @@ var deserializeAws_restJson1GetApplicationComponentStrategiesCommandError = func
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -698,28 +639,26 @@ export var deserializeAws_restJson1GetAssessmentCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    dataCollectionDetails: undefined,
-                    id: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.dataCollectionDetails !== undefined && data.dataCollectionDetails !== null) {
+                if (data.dataCollectionDetails != null) {
                     contents.dataCollectionDetails = deserializeAws_restJson1DataCollectionDetails(data.dataCollectionDetails, context);
                 }
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetAssessmentCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -752,14 +691,14 @@ var deserializeAws_restJson1GetAssessmentCommandError = function (output, contex
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -771,64 +710,53 @@ export var deserializeAws_restJson1GetImportFileTaskCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetImportFileTaskCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    completionTime: undefined,
-                    id: undefined,
-                    importName: undefined,
-                    inputS3Bucket: undefined,
-                    inputS3Key: undefined,
-                    numberOfRecordsFailed: undefined,
-                    numberOfRecordsSuccess: undefined,
-                    startTime: undefined,
-                    status: undefined,
-                    statusReportS3Bucket: undefined,
-                    statusReportS3Key: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.completionTime !== undefined && data.completionTime !== null) {
+                if (data.completionTime != null) {
                     contents.completionTime = __expectNonNull(__parseEpochTimestamp(__expectNumber(data.completionTime)));
                 }
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                if (data.importName !== undefined && data.importName !== null) {
+                if (data.importName != null) {
                     contents.importName = __expectString(data.importName);
                 }
-                if (data.inputS3Bucket !== undefined && data.inputS3Bucket !== null) {
+                if (data.inputS3Bucket != null) {
                     contents.inputS3Bucket = __expectString(data.inputS3Bucket);
                 }
-                if (data.inputS3Key !== undefined && data.inputS3Key !== null) {
+                if (data.inputS3Key != null) {
                     contents.inputS3Key = __expectString(data.inputS3Key);
                 }
-                if (data.numberOfRecordsFailed !== undefined && data.numberOfRecordsFailed !== null) {
+                if (data.numberOfRecordsFailed != null) {
                     contents.numberOfRecordsFailed = __expectInt32(data.numberOfRecordsFailed);
                 }
-                if (data.numberOfRecordsSuccess !== undefined && data.numberOfRecordsSuccess !== null) {
+                if (data.numberOfRecordsSuccess != null) {
                     contents.numberOfRecordsSuccess = __expectInt32(data.numberOfRecordsSuccess);
                 }
-                if (data.startTime !== undefined && data.startTime !== null) {
+                if (data.startTime != null) {
                     contents.startTime = __expectNonNull(__parseEpochTimestamp(__expectNumber(data.startTime)));
                 }
-                if (data.status !== undefined && data.status !== null) {
+                if (data.status != null) {
                     contents.status = __expectString(data.status);
                 }
-                if (data.statusReportS3Bucket !== undefined && data.statusReportS3Bucket !== null) {
+                if (data.statusReportS3Bucket != null) {
                     contents.statusReportS3Bucket = __expectString(data.statusReportS3Bucket);
                 }
-                if (data.statusReportS3Key !== undefined && data.statusReportS3Key !== null) {
+                if (data.statusReportS3Key != null) {
                     contents.statusReportS3Key = __expectString(data.statusReportS3Key);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetImportFileTaskCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -865,14 +793,14 @@ var deserializeAws_restJson1GetImportFileTaskCommandError = function (output, co
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -884,32 +812,29 @@ export var deserializeAws_restJson1GetPortfolioPreferencesCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetPortfolioPreferencesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    applicationPreferences: undefined,
-                    databasePreferences: undefined,
-                    prioritizeBusinessGoals: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.applicationPreferences !== undefined && data.applicationPreferences !== null) {
+                if (data.applicationPreferences != null) {
                     contents.applicationPreferences = deserializeAws_restJson1ApplicationPreferences(data.applicationPreferences, context);
                 }
-                if (data.databasePreferences !== undefined && data.databasePreferences !== null) {
+                if (data.databasePreferences != null) {
                     contents.databasePreferences = deserializeAws_restJson1DatabasePreferences(data.databasePreferences, context);
                 }
-                if (data.prioritizeBusinessGoals !== undefined && data.prioritizeBusinessGoals !== null) {
+                if (data.prioritizeBusinessGoals != null) {
                     contents.prioritizeBusinessGoals = deserializeAws_restJson1PrioritizeBusinessGoals(data.prioritizeBusinessGoals, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetPortfolioPreferencesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -942,14 +867,14 @@ var deserializeAws_restJson1GetPortfolioPreferencesCommandError = function (outp
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -961,24 +886,23 @@ export var deserializeAws_restJson1GetPortfolioSummaryCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetPortfolioSummaryCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessmentSummary: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.assessmentSummary !== undefined && data.assessmentSummary !== null) {
+                if (data.assessmentSummary != null) {
                     contents.assessmentSummary = deserializeAws_restJson1AssessmentSummary(data.assessmentSummary, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetPortfolioSummaryCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1007,14 +931,14 @@ var deserializeAws_restJson1GetPortfolioSummaryCommandError = function (output,
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -1026,28 +950,26 @@ export var deserializeAws_restJson1GetRecommendationReportDetailsCommand = funct
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetRecommendationReportDetailsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    id: undefined,
-                    recommendationReportDetails: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                if (data.recommendationReportDetails !== undefined && data.recommendationReportDetails !== null) {
+                if (data.recommendationReportDetails != null) {
                     contents.recommendationReportDetails = deserializeAws_restJson1RecommendationReportDetails(data.recommendationReportDetails, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetRecommendationReportDetailsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1084,14 +1006,14 @@ var deserializeAws_restJson1GetRecommendationReportDetailsCommandError = functio
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1103,32 +1025,29 @@ export var deserializeAws_restJson1GetServerDetailsCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetServerDetailsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    associatedApplications: undefined,
-                    nextToken: undefined,
-                    serverDetail: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.associatedApplications !== undefined && data.associatedApplications !== null) {
+                if (data.associatedApplications != null) {
                     contents.associatedApplications = deserializeAws_restJson1AssociatedApplications(data.associatedApplications, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.serverDetail !== undefined && data.serverDetail !== null) {
+                if (data.serverDetail != null) {
                     contents.serverDetail = deserializeAws_restJson1ServerDetail(data.serverDetail, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetServerDetailsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1165,14 +1084,14 @@ var deserializeAws_restJson1GetServerDetailsCommandError = function (output, con
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1184,24 +1103,23 @@ export var deserializeAws_restJson1GetServerStrategiesCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetServerStrategiesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    serverStrategies: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.serverStrategies !== undefined && data.serverStrategies !== null) {
+                if (data.serverStrategies != null) {
                     contents.serverStrategies = deserializeAws_restJson1ServerStrategies(data.serverStrategies, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetServerStrategiesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1238,14 +1156,14 @@ var deserializeAws_restJson1GetServerStrategiesCommandError = function (output,
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1257,28 +1175,26 @@ export var deserializeAws_restJson1ListApplicationComponentsCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListApplicationComponentsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    applicationComponentInfos: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.applicationComponentInfos !== undefined && data.applicationComponentInfos !== null) {
+                if (data.applicationComponentInfos != null) {
                     contents.applicationComponentInfos = deserializeAws_restJson1ApplicationComponentDetails(data.applicationComponentInfos, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListApplicationComponentsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1311,14 +1227,14 @@ var deserializeAws_restJson1ListApplicationComponentsCommandError = function (ou
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1330,28 +1246,26 @@ export var deserializeAws_restJson1ListCollectorsCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListCollectorsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Collectors: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.Collectors !== undefined && data.Collectors !== null) {
+                if (data.Collectors != null) {
                     contents.Collectors = deserializeAws_restJson1Collectors(data.Collectors, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListCollectorsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1384,14 +1298,14 @@ var deserializeAws_restJson1ListCollectorsCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1403,28 +1317,26 @@ export var deserializeAws_restJson1ListImportFileTaskCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListImportFileTaskCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    taskInfos: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.taskInfos !== undefined && data.taskInfos !== null) {
+                if (data.taskInfos != null) {
                     contents.taskInfos = deserializeAws_restJson1ListImportFileTaskInformation(data.taskInfos, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListImportFileTaskCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1457,14 +1369,14 @@ var deserializeAws_restJson1ListImportFileTaskCommandError = function (output, c
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1476,28 +1388,26 @@ export var deserializeAws_restJson1ListServersCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListServersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    serverInfos: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.serverInfos !== undefined && data.serverInfos !== null) {
+                if (data.serverInfos != null) {
                     contents.serverInfos = deserializeAws_restJson1ServerDetails(data.serverInfos, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListServersCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1530,14 +1440,14 @@ var deserializeAws_restJson1ListServersCommandError = function (output, context)
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1549,18 +1459,18 @@ export var deserializeAws_restJson1PutPortfolioPreferencesCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1PutPortfolioPreferencesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1PutPortfolioPreferencesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1597,14 +1507,14 @@ var deserializeAws_restJson1PutPortfolioPreferencesCommandError = function (outp
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1616,24 +1526,23 @@ export var deserializeAws_restJson1StartAssessmentCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StartAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    assessmentId: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.assessmentId !== undefined && data.assessmentId !== null) {
+                if (data.assessmentId != null) {
                     contents.assessmentId = __expectString(data.assessmentId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1StartAssessmentCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1666,14 +1575,14 @@ var deserializeAws_restJson1StartAssessmentCommandError = function (output, cont
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1685,24 +1594,23 @@ export var deserializeAws_restJson1StartImportFileTaskCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StartImportFileTaskCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    id: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1StartImportFileTaskCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1739,14 +1647,14 @@ var deserializeAws_restJson1StartImportFileTaskCommandError = function (output,
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1758,24 +1666,23 @@ export var deserializeAws_restJson1StartRecommendationReportGenerationCommand =
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StartRecommendationReportGenerationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    id: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.id !== undefined && data.id !== null) {
+                if (data.id != null) {
                     contents.id = __expectString(data.id);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1StartRecommendationReportGenerationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1812,14 +1719,14 @@ var deserializeAws_restJson1StartRecommendationReportGenerationCommandError = fu
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1831,18 +1738,18 @@ export var deserializeAws_restJson1StopAssessmentCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StopAssessmentCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1StopAssessmentCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1875,14 +1782,14 @@ var deserializeAws_restJson1StopAssessmentCommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1894,18 +1801,18 @@ export var deserializeAws_restJson1UpdateApplicationComponentConfigCommand = fun
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateApplicationComponentConfigCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateApplicationComponentConfigCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1938,14 +1845,14 @@ var deserializeAws_restJson1UpdateApplicationComponentConfigCommandError = funct
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1957,18 +1864,18 @@ export var deserializeAws_restJson1UpdateServerConfigCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateServerConfigCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateServerConfigCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2001,23 +1908,24 @@ var deserializeAws_restJson1UpdateServerConfigCommandError = function (output, c
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
+var map = __map;
 var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new AccessDeniedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -2027,9 +1935,9 @@ var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutp
 var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -2039,9 +1947,9 @@ var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new InternalServerException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -2051,9 +1959,9 @@ var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOu
 var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -2063,9 +1971,9 @@ var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsed
 var deserializeAws_restJson1ServiceLinkedRoleLockClientExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ServiceLinkedRoleLockClientException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -2075,9 +1983,9 @@ var deserializeAws_restJson1ServiceLinkedRoleLockClientExceptionResponse = funct
 var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ServiceQuotaExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -2087,9 +1995,9 @@ var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = function (pa
 var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ThrottlingException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -2099,9 +2007,9 @@ var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput
 var deserializeAws_restJson1ValidationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -2122,9 +2030,6 @@ var serializeAws_restJson1AwsManagedTargetDestinations = function (input, contex
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2157,9 +2062,6 @@ var serializeAws_restJson1GroupIds = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1Group(entry, context);
     });
 };
@@ -2172,9 +2074,6 @@ var serializeAws_restJson1HeterogeneousTargetDatabaseEngines = function (input,
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2187,9 +2086,6 @@ var serializeAws_restJson1HomogeneousTargetDatabaseEngines = function (input, co
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2219,9 +2115,6 @@ var serializeAws_restJson1NoPreferenceTargetDestinations = function (input, cont
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2239,9 +2132,6 @@ var serializeAws_restJson1SelfManageTargetDestinations = function (input, contex
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2252,9 +2142,6 @@ var serializeAws_restJson1SourceCodeList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1SourceCode(entry, context);
     });
 };
@@ -2265,9 +2152,6 @@ var serializeAws_restJson1TargetDatabaseEngines = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -2465,17 +2349,17 @@ var deserializeAws_restJson1DatabaseConfigDetail = function (output, context) {
     };
 };
 var deserializeAws_restJson1DatabaseMigrationPreference = function (output, context) {
-    if (output.heterogeneous !== undefined && output.heterogeneous !== null) {
+    if (output.heterogeneous != null) {
         return {
             heterogeneous: deserializeAws_restJson1Heterogeneous(output.heterogeneous, context),
         };
     }
-    if (output.homogeneous !== undefined && output.homogeneous !== null) {
+    if (output.homogeneous != null) {
         return {
             homogeneous: deserializeAws_restJson1Homogeneous(output.homogeneous, context),
         };
     }
-    if (output.noPreference !== undefined && output.noPreference !== null) {
+    if (output.noPreference != null) {
         return {
             noPreference: deserializeAws_restJson1NoDatabaseMigrationPreference(output.noPreference, context),
         };
@@ -2612,17 +2496,17 @@ var deserializeAws_restJson1ListStrategySummary = function (output, context) {
     return retVal;
 };
 var deserializeAws_restJson1ManagementPreference = function (output, context) {
-    if (output.awsManagedResources !== undefined && output.awsManagedResources !== null) {
+    if (output.awsManagedResources != null) {
         return {
             awsManagedResources: deserializeAws_restJson1AwsManagedResources(output.awsManagedResources, context),
         };
     }
-    if (output.noPreference !== undefined && output.noPreference !== null) {
+    if (output.noPreference != null) {
         return {
             noPreference: deserializeAws_restJson1NoManagementPreference(output.noPreference, context),
         };
     }
-    if (output.selfManageResources !== undefined && output.selfManageResources !== null) {
+    if (output.selfManageResources != null) {
         return {
             selfManageResources: deserializeAws_restJson1SelfManageResources(output.selfManageResources, context),
         };