@aws-sdk/client-devops-guru 3.141.0 → 3.150.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,6 +1,6 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseEpochTimestamp as __parseEpochTimestamp, strictParseInt32 as __strictParseInt32, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, limitedParseDouble as __limitedParseDouble, map as __map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, strictParseInt32 as __strictParseInt32, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
 import { DevOpsGuruServiceException as __BaseException } from "../models/DevOpsGuruServiceException";
 import { AccessDeniedException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, ValidationException, } from "../models/models_0";
@@ -29,7 +29,7 @@ export var serializeAws_restJson1AddNotificationChannelCommand = function (input
     });
 }); };
 export var serializeAws_restJson1DeleteInsightCommand = 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()];
@@ -37,16 +37,7 @@ export var serializeAws_restJson1DeleteInsightCommand = 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 || "") + "/insights/{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,
@@ -108,7 +99,7 @@ export var serializeAws_restJson1DescribeAccountOverviewCommand = function (inpu
     });
 }); };
 export var serializeAws_restJson1DescribeAnomalyCommand = 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()];
@@ -116,17 +107,10 @@ export var serializeAws_restJson1DescribeAnomalyCommand = function (input, conte
                 _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 || "") + "/anomalies/{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.");
-                }
-                query = __assign({}, (input.AccountId !== undefined && { AccountId: input.AccountId }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "Id", function () { return input.Id; }, "{Id}", false);
+                query = map({
+                    AccountId: [, input.AccountId],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -189,7 +173,7 @@ export var serializeAws_restJson1DescribeFeedbackCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1DescribeInsightCommand = 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()];
@@ -197,17 +181,10 @@ export var serializeAws_restJson1DescribeInsightCommand = function (input, conte
                 _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 || "") + "/insights/{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.");
-                }
-                query = __assign({}, (input.AccountId !== undefined && { AccountId: input.AccountId }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "Id", function () { return input.Id; }, "{Id}", false);
+                query = map({
+                    AccountId: [, input.AccountId],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -302,7 +279,7 @@ export var serializeAws_restJson1DescribeOrganizationResourceCollectionHealthCom
     });
 }); };
 export var serializeAws_restJson1DescribeResourceCollectionHealthCommand = 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()];
@@ -311,17 +288,10 @@ export var serializeAws_restJson1DescribeResourceCollectionHealthCommand = funct
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/accounts/health/resource-collection/{ResourceCollectionType}";
-                if (input.ResourceCollectionType !== undefined) {
-                    labelValue = input.ResourceCollectionType;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ResourceCollectionType.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ResourceCollectionType}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ResourceCollectionType.");
-                }
-                query = __assign({}, (input.NextToken !== undefined && { NextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ResourceCollectionType", function () { return input.ResourceCollectionType; }, "{ResourceCollectionType}", false);
+                query = map({
+                    NextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -368,7 +338,9 @@ export var serializeAws_restJson1GetCostEstimationCommand = 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 || "") + "/cost-estimation";
-                query = __assign({}, (input.NextToken !== undefined && { NextToken: input.NextToken }));
+                query = map({
+                    NextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -383,7 +355,7 @@ export var serializeAws_restJson1GetCostEstimationCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1GetResourceCollectionCommand = 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()];
@@ -392,17 +364,10 @@ export var serializeAws_restJson1GetResourceCollectionCommand = function (input,
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/resource-collections/{ResourceCollectionType}";
-                if (input.ResourceCollectionType !== undefined) {
-                    labelValue = input.ResourceCollectionType;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ResourceCollectionType.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ResourceCollectionType}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ResourceCollectionType.");
-                }
-                query = __assign({}, (input.NextToken !== undefined && { NextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ResourceCollectionType", function () { return input.ResourceCollectionType; }, "{ResourceCollectionType}", false);
+                query = map({
+                    NextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -417,7 +382,7 @@ export var serializeAws_restJson1GetResourceCollectionCommand = function (input,
     });
 }); };
 export var serializeAws_restJson1ListAnomaliesForInsightCommand = 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()];
@@ -427,16 +392,7 @@ export var serializeAws_restJson1ListAnomaliesForInsightCommand = function (inpu
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/anomalies/insight/{InsightId}";
-                if (input.InsightId !== undefined) {
-                    labelValue = input.InsightId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: InsightId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{InsightId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: InsightId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "InsightId", function () { return input.InsightId; }, "{InsightId}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign({}, (input.AccountId != null && { AccountId: input.AccountId })), (input.MaxResults != null && { MaxResults: input.MaxResults })), (input.NextToken != null && { NextToken: input.NextToken })), (input.StartTimeRange != null && {
                     StartTimeRange: serializeAws_restJson1StartTimeRange(input.StartTimeRange, context),
                 })));
@@ -657,7 +613,7 @@ export var serializeAws_restJson1PutFeedbackCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1RemoveNotificationChannelCommand = 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()];
@@ -665,16 +621,7 @@ export var serializeAws_restJson1RemoveNotificationChannelCommand = function (in
                 _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 || "") + "/channels/{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,
@@ -856,24 +803,23 @@ export var deserializeAws_restJson1AddNotificationChannelCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AddNotificationChannelCommandError(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_restJson1AddNotificationChannelCommandError = 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) {
@@ -918,14 +864,14 @@ var deserializeAws_restJson1AddNotificationChannelCommandError = function (outpu
             case 15: throw _d.sent();
             case 16:
                 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 = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -937,18 +883,18 @@ export var deserializeAws_restJson1DeleteInsightCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteInsightCommandError(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_restJson1DeleteInsightCommandError = 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) {
@@ -989,14 +935,14 @@ var deserializeAws_restJson1DeleteInsightCommandError = function (output, contex
             case 13: throw _d.sent();
             case 14:
                 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 = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -1008,36 +954,32 @@ export var deserializeAws_restJson1DescribeAccountHealthCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeAccountHealthCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    MetricsAnalyzed: undefined,
-                    OpenProactiveInsights: undefined,
-                    OpenReactiveInsights: undefined,
-                    ResourceHours: 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.MetricsAnalyzed !== undefined && data.MetricsAnalyzed !== null) {
+                if (data.MetricsAnalyzed != null) {
                     contents.MetricsAnalyzed = __expectInt32(data.MetricsAnalyzed);
                 }
-                if (data.OpenProactiveInsights !== undefined && data.OpenProactiveInsights !== null) {
+                if (data.OpenProactiveInsights != null) {
                     contents.OpenProactiveInsights = __expectInt32(data.OpenProactiveInsights);
                 }
-                if (data.OpenReactiveInsights !== undefined && data.OpenReactiveInsights !== null) {
+                if (data.OpenReactiveInsights != null) {
                     contents.OpenReactiveInsights = __expectInt32(data.OpenReactiveInsights);
                 }
-                if (data.ResourceHours !== undefined && data.ResourceHours !== null) {
+                if (data.ResourceHours != null) {
                     contents.ResourceHours = __expectLong(data.ResourceHours);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeAccountHealthCommandError = 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) {
@@ -1070,14 +1012,14 @@ var deserializeAws_restJson1DescribeAccountHealthCommandError = function (output
             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];
         }
     });
 }); };
@@ -1089,32 +1031,29 @@ export var deserializeAws_restJson1DescribeAccountOverviewCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeAccountOverviewCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    MeanTimeToRecoverInMilliseconds: undefined,
-                    ProactiveInsights: undefined,
-                    ReactiveInsights: 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.MeanTimeToRecoverInMilliseconds !== undefined && data.MeanTimeToRecoverInMilliseconds !== null) {
+                if (data.MeanTimeToRecoverInMilliseconds != null) {
                     contents.MeanTimeToRecoverInMilliseconds = __expectLong(data.MeanTimeToRecoverInMilliseconds);
                 }
-                if (data.ProactiveInsights !== undefined && data.ProactiveInsights !== null) {
+                if (data.ProactiveInsights != null) {
                     contents.ProactiveInsights = __expectInt32(data.ProactiveInsights);
                 }
-                if (data.ReactiveInsights !== undefined && data.ReactiveInsights !== null) {
+                if (data.ReactiveInsights != null) {
                     contents.ReactiveInsights = __expectInt32(data.ReactiveInsights);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeAccountOverviewCommandError = 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) {
@@ -1147,14 +1086,14 @@ var deserializeAws_restJson1DescribeAccountOverviewCommandError = 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];
         }
     });
 }); };
@@ -1166,28 +1105,26 @@ export var deserializeAws_restJson1DescribeAnomalyCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeAnomalyCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ProactiveAnomaly: undefined,
-                    ReactiveAnomaly: 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.ProactiveAnomaly !== undefined && data.ProactiveAnomaly !== null) {
+                if (data.ProactiveAnomaly != null) {
                     contents.ProactiveAnomaly = deserializeAws_restJson1ProactiveAnomaly(data.ProactiveAnomaly, context);
                 }
-                if (data.ReactiveAnomaly !== undefined && data.ReactiveAnomaly !== null) {
+                if (data.ReactiveAnomaly != null) {
                     contents.ReactiveAnomaly = deserializeAws_restJson1ReactiveAnomaly(data.ReactiveAnomaly, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeAnomalyCommandError = 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) {
@@ -1224,14 +1161,14 @@ var deserializeAws_restJson1DescribeAnomalyCommandError = function (output, cont
             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];
         }
     });
 }); };
@@ -1243,24 +1180,23 @@ export var deserializeAws_restJson1DescribeEventSourcesConfigCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeEventSourcesConfigCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    EventSources: 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.EventSources !== undefined && data.EventSources !== null) {
+                if (data.EventSources != null) {
                     contents.EventSources = deserializeAws_restJson1EventSourcesConfig(data.EventSources, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeEventSourcesConfigCommandError = 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) {
@@ -1293,14 +1229,14 @@ var deserializeAws_restJson1DescribeEventSourcesConfigCommandError = function (o
             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];
         }
     });
 }); };
@@ -1312,24 +1248,23 @@ export var deserializeAws_restJson1DescribeFeedbackCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeFeedbackCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    InsightFeedback: 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.InsightFeedback !== undefined && data.InsightFeedback !== null) {
+                if (data.InsightFeedback != null) {
                     contents.InsightFeedback = deserializeAws_restJson1InsightFeedback(data.InsightFeedback, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeFeedbackCommandError = 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) {
@@ -1366,14 +1301,14 @@ var deserializeAws_restJson1DescribeFeedbackCommandError = 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];
         }
     });
 }); };
@@ -1385,28 +1320,26 @@ export var deserializeAws_restJson1DescribeInsightCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeInsightCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ProactiveInsight: undefined,
-                    ReactiveInsight: 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.ProactiveInsight !== undefined && data.ProactiveInsight !== null) {
+                if (data.ProactiveInsight != null) {
                     contents.ProactiveInsight = deserializeAws_restJson1ProactiveInsight(data.ProactiveInsight, context);
                 }
-                if (data.ReactiveInsight !== undefined && data.ReactiveInsight !== null) {
+                if (data.ReactiveInsight != null) {
                     contents.ReactiveInsight = deserializeAws_restJson1ReactiveInsight(data.ReactiveInsight, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeInsightCommandError = 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) {
@@ -1443,14 +1376,14 @@ var deserializeAws_restJson1DescribeInsightCommandError = function (output, cont
             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];
         }
     });
 }); };
@@ -1462,36 +1395,32 @@ export var deserializeAws_restJson1DescribeOrganizationHealthCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeOrganizationHealthCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    MetricsAnalyzed: undefined,
-                    OpenProactiveInsights: undefined,
-                    OpenReactiveInsights: undefined,
-                    ResourceHours: 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.MetricsAnalyzed !== undefined && data.MetricsAnalyzed !== null) {
+                if (data.MetricsAnalyzed != null) {
                     contents.MetricsAnalyzed = __expectInt32(data.MetricsAnalyzed);
                 }
-                if (data.OpenProactiveInsights !== undefined && data.OpenProactiveInsights !== null) {
+                if (data.OpenProactiveInsights != null) {
                     contents.OpenProactiveInsights = __expectInt32(data.OpenProactiveInsights);
                 }
-                if (data.OpenReactiveInsights !== undefined && data.OpenReactiveInsights !== null) {
+                if (data.OpenReactiveInsights != null) {
                     contents.OpenReactiveInsights = __expectInt32(data.OpenReactiveInsights);
                 }
-                if (data.ResourceHours !== undefined && data.ResourceHours !== null) {
+                if (data.ResourceHours != null) {
                     contents.ResourceHours = __expectLong(data.ResourceHours);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeOrganizationHealthCommandError = 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) {
@@ -1524,14 +1453,14 @@ var deserializeAws_restJson1DescribeOrganizationHealthCommandError = function (o
             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];
         }
     });
 }); };
@@ -1543,28 +1472,26 @@ export var deserializeAws_restJson1DescribeOrganizationOverviewCommand = functio
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeOrganizationOverviewCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ProactiveInsights: undefined,
-                    ReactiveInsights: 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.ProactiveInsights !== undefined && data.ProactiveInsights !== null) {
+                if (data.ProactiveInsights != null) {
                     contents.ProactiveInsights = __expectInt32(data.ProactiveInsights);
                 }
-                if (data.ReactiveInsights !== undefined && data.ReactiveInsights !== null) {
+                if (data.ReactiveInsights != null) {
                     contents.ReactiveInsights = __expectInt32(data.ReactiveInsights);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeOrganizationOverviewCommandError = 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 +1524,14 @@ var deserializeAws_restJson1DescribeOrganizationOverviewCommandError = function
             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];
         }
     });
 }); };
@@ -1616,40 +1543,35 @@ export var deserializeAws_restJson1DescribeOrganizationResourceCollectionHealthC
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeOrganizationResourceCollectionHealthCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Account: undefined,
-                    CloudFormation: undefined,
-                    NextToken: undefined,
-                    Service: undefined,
-                    Tags: 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.Account !== undefined && data.Account !== null) {
+                if (data.Account != null) {
                     contents.Account = deserializeAws_restJson1AccountHealths(data.Account, context);
                 }
-                if (data.CloudFormation !== undefined && data.CloudFormation !== null) {
+                if (data.CloudFormation != null) {
                     contents.CloudFormation = deserializeAws_restJson1CloudFormationHealths(data.CloudFormation, context);
                 }
-                if (data.NextToken !== undefined && data.NextToken !== null) {
+                if (data.NextToken != null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
-                if (data.Service !== undefined && data.Service !== null) {
+                if (data.Service != null) {
                     contents.Service = deserializeAws_restJson1ServiceHealths(data.Service, context);
                 }
-                if (data.Tags !== undefined && data.Tags !== null) {
+                if (data.Tags != null) {
                     contents.Tags = deserializeAws_restJson1TagHealths(data.Tags, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeOrganizationResourceCollectionHealthCommandError = 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) {
@@ -1682,14 +1604,14 @@ var deserializeAws_restJson1DescribeOrganizationResourceCollectionHealthCommandE
             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];
         }
     });
 }); };
@@ -1701,36 +1623,32 @@ export var deserializeAws_restJson1DescribeResourceCollectionHealthCommand = fun
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeResourceCollectionHealthCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CloudFormation: undefined,
-                    NextToken: undefined,
-                    Service: undefined,
-                    Tags: 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.CloudFormation !== undefined && data.CloudFormation !== null) {
+                if (data.CloudFormation != null) {
                     contents.CloudFormation = deserializeAws_restJson1CloudFormationHealths(data.CloudFormation, context);
                 }
-                if (data.NextToken !== undefined && data.NextToken !== null) {
+                if (data.NextToken != null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
-                if (data.Service !== undefined && data.Service !== null) {
+                if (data.Service != null) {
                     contents.Service = deserializeAws_restJson1ServiceHealths(data.Service, context);
                 }
-                if (data.Tags !== undefined && data.Tags !== null) {
+                if (data.Tags != null) {
                     contents.Tags = deserializeAws_restJson1TagHealths(data.Tags, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeResourceCollectionHealthCommandError = 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) {
@@ -1763,14 +1681,14 @@ var deserializeAws_restJson1DescribeResourceCollectionHealthCommandError = 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];
         }
     });
 }); };
@@ -1782,24 +1700,23 @@ export var deserializeAws_restJson1DescribeServiceIntegrationCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeServiceIntegrationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ServiceIntegration: 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.ServiceIntegration !== undefined && data.ServiceIntegration !== null) {
+                if (data.ServiceIntegration != null) {
                     contents.ServiceIntegration = deserializeAws_restJson1ServiceIntegrationConfig(data.ServiceIntegration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeServiceIntegrationCommandError = 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) {
@@ -1836,14 +1753,14 @@ var deserializeAws_restJson1DescribeServiceIntegrationCommandError = function (o
             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];
         }
     });
 }); };
@@ -1855,44 +1772,38 @@ export var deserializeAws_restJson1GetCostEstimationCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetCostEstimationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Costs: undefined,
-                    NextToken: undefined,
-                    ResourceCollection: undefined,
-                    Status: undefined,
-                    TimeRange: undefined,
-                    TotalCost: 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.Costs !== undefined && data.Costs !== null) {
+                if (data.Costs != null) {
                     contents.Costs = deserializeAws_restJson1ServiceResourceCosts(data.Costs, context);
                 }
-                if (data.NextToken !== undefined && data.NextToken !== null) {
+                if (data.NextToken != null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
-                if (data.ResourceCollection !== undefined && data.ResourceCollection !== null) {
+                if (data.ResourceCollection != null) {
                     contents.ResourceCollection = deserializeAws_restJson1CostEstimationResourceCollectionFilter(data.ResourceCollection, context);
                 }
-                if (data.Status !== undefined && data.Status !== null) {
+                if (data.Status != null) {
                     contents.Status = __expectString(data.Status);
                 }
-                if (data.TimeRange !== undefined && data.TimeRange !== null) {
+                if (data.TimeRange != null) {
                     contents.TimeRange = deserializeAws_restJson1CostEstimationTimeRange(data.TimeRange, context);
                 }
-                if (data.TotalCost !== undefined && data.TotalCost !== null) {
+                if (data.TotalCost != null) {
                     contents.TotalCost = __limitedParseDouble(data.TotalCost);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetCostEstimationCommandError = 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) {
@@ -1929,14 +1840,14 @@ var deserializeAws_restJson1GetCostEstimationCommandError = 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];
         }
     });
 }); };
@@ -1948,28 +1859,26 @@ export var deserializeAws_restJson1GetResourceCollectionCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetResourceCollectionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    ResourceCollection: 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.ResourceCollection !== undefined && data.ResourceCollection !== null) {
+                if (data.ResourceCollection != null) {
                     contents.ResourceCollection = deserializeAws_restJson1ResourceCollectionFilter(data.ResourceCollection, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetResourceCollectionCommandError = 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) {
@@ -2006,14 +1915,14 @@ var deserializeAws_restJson1GetResourceCollectionCommandError = 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];
         }
     });
 }); };
@@ -2025,32 +1934,29 @@ export var deserializeAws_restJson1ListAnomaliesForInsightCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListAnomaliesForInsightCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    ProactiveAnomalies: undefined,
-                    ReactiveAnomalies: 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.ProactiveAnomalies !== undefined && data.ProactiveAnomalies !== null) {
+                if (data.ProactiveAnomalies != null) {
                     contents.ProactiveAnomalies = deserializeAws_restJson1ProactiveAnomalies(data.ProactiveAnomalies, context);
                 }
-                if (data.ReactiveAnomalies !== undefined && data.ReactiveAnomalies !== null) {
+                if (data.ReactiveAnomalies != null) {
                     contents.ReactiveAnomalies = deserializeAws_restJson1ReactiveAnomalies(data.ReactiveAnomalies, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListAnomaliesForInsightCommandError = 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) {
@@ -2087,14 +1993,14 @@ var deserializeAws_restJson1ListAnomaliesForInsightCommandError = 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];
         }
     });
 }); };
@@ -2106,32 +2012,29 @@ export var deserializeAws_restJson1ListAnomalousLogGroupsCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListAnomalousLogGroupsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    AnomalousLogGroups: undefined,
-                    InsightId: 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.AnomalousLogGroups !== undefined && data.AnomalousLogGroups !== null) {
+                if (data.AnomalousLogGroups != null) {
                     contents.AnomalousLogGroups = deserializeAws_restJson1AnomalousLogGroups(data.AnomalousLogGroups, context);
                 }
-                if (data.InsightId !== undefined && data.InsightId !== null) {
+                if (data.InsightId != null) {
                     contents.InsightId = __expectString(data.InsightId);
                 }
-                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_restJson1ListAnomalousLogGroupsCommandError = 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) {
@@ -2168,14 +2071,14 @@ var deserializeAws_restJson1ListAnomalousLogGroupsCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -2187,28 +2090,26 @@ export var deserializeAws_restJson1ListEventsCommand = function (output, context
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListEventsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Events: 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.Events !== undefined && data.Events !== null) {
+                if (data.Events != null) {
                     contents.Events = deserializeAws_restJson1Events(data.Events, 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_restJson1ListEventsCommandError = 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) {
@@ -2245,14 +2146,14 @@ var deserializeAws_restJson1ListEventsCommandError = function (output, context)
             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];
         }
     });
 }); };
@@ -2264,32 +2165,29 @@ export var deserializeAws_restJson1ListInsightsCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListInsightsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    ProactiveInsights: undefined,
-                    ReactiveInsights: 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.ProactiveInsights !== undefined && data.ProactiveInsights !== null) {
+                if (data.ProactiveInsights != null) {
                     contents.ProactiveInsights = deserializeAws_restJson1ProactiveInsights(data.ProactiveInsights, context);
                 }
-                if (data.ReactiveInsights !== undefined && data.ReactiveInsights !== null) {
+                if (data.ReactiveInsights != null) {
                     contents.ReactiveInsights = deserializeAws_restJson1ReactiveInsights(data.ReactiveInsights, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListInsightsCommandError = 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) {
@@ -2322,14 +2220,14 @@ var deserializeAws_restJson1ListInsightsCommandError = 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];
         }
     });
 }); };
@@ -2341,28 +2239,26 @@ export var deserializeAws_restJson1ListMonitoredResourcesCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListMonitoredResourcesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    MonitoredResourceIdentifiers: 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.MonitoredResourceIdentifiers !== undefined && data.MonitoredResourceIdentifiers !== null) {
+                if (data.MonitoredResourceIdentifiers != null) {
                     contents.MonitoredResourceIdentifiers = deserializeAws_restJson1MonitoredResourceIdentifiers(data.MonitoredResourceIdentifiers, 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_restJson1ListMonitoredResourcesCommandError = 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) {
@@ -2395,14 +2291,14 @@ var deserializeAws_restJson1ListMonitoredResourcesCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -2414,28 +2310,26 @@ export var deserializeAws_restJson1ListNotificationChannelsCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListNotificationChannelsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Channels: 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.Channels !== undefined && data.Channels !== null) {
+                if (data.Channels != null) {
                     contents.Channels = deserializeAws_restJson1Channels(data.Channels, 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_restJson1ListNotificationChannelsCommandError = 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) {
@@ -2468,14 +2362,14 @@ var deserializeAws_restJson1ListNotificationChannelsCommandError = function (out
             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];
         }
     });
 }); };
@@ -2487,32 +2381,29 @@ export var deserializeAws_restJson1ListOrganizationInsightsCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListOrganizationInsightsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    ProactiveInsights: undefined,
-                    ReactiveInsights: 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.ProactiveInsights !== undefined && data.ProactiveInsights !== null) {
+                if (data.ProactiveInsights != null) {
                     contents.ProactiveInsights = deserializeAws_restJson1ProactiveOrganizationInsights(data.ProactiveInsights, context);
                 }
-                if (data.ReactiveInsights !== undefined && data.ReactiveInsights !== null) {
+                if (data.ReactiveInsights != null) {
                     contents.ReactiveInsights = deserializeAws_restJson1ReactiveOrganizationInsights(data.ReactiveInsights, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListOrganizationInsightsCommandError = 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) {
@@ -2545,14 +2436,14 @@ var deserializeAws_restJson1ListOrganizationInsightsCommandError = function (out
             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];
         }
     });
 }); };
@@ -2564,28 +2455,26 @@ export var deserializeAws_restJson1ListRecommendationsCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListRecommendationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    Recommendations: 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.Recommendations !== undefined && data.Recommendations !== null) {
+                if (data.Recommendations != null) {
                     contents.Recommendations = deserializeAws_restJson1Recommendations(data.Recommendations, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListRecommendationsCommandError = 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) {
@@ -2622,14 +2511,14 @@ var deserializeAws_restJson1ListRecommendationsCommandError = 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];
         }
     });
 }); };
@@ -2641,18 +2530,18 @@ export var deserializeAws_restJson1PutFeedbackCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1PutFeedbackCommandError(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_restJson1PutFeedbackCommandError = 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) {
@@ -2693,14 +2582,14 @@ var deserializeAws_restJson1PutFeedbackCommandError = function (output, context)
             case 13: throw _d.sent();
             case 14:
                 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 = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2712,18 +2601,18 @@ export var deserializeAws_restJson1RemoveNotificationChannelCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1RemoveNotificationChannelCommandError(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_restJson1RemoveNotificationChannelCommandError = 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) {
@@ -2764,14 +2653,14 @@ var deserializeAws_restJson1RemoveNotificationChannelCommandError = function (ou
             case 13: throw _d.sent();
             case 14:
                 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 = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2783,32 +2672,29 @@ export var deserializeAws_restJson1SearchInsightsCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1SearchInsightsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    ProactiveInsights: undefined,
-                    ReactiveInsights: 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.ProactiveInsights !== undefined && data.ProactiveInsights !== null) {
+                if (data.ProactiveInsights != null) {
                     contents.ProactiveInsights = deserializeAws_restJson1ProactiveInsights(data.ProactiveInsights, context);
                 }
-                if (data.ReactiveInsights !== undefined && data.ReactiveInsights !== null) {
+                if (data.ReactiveInsights != null) {
                     contents.ReactiveInsights = deserializeAws_restJson1ReactiveInsights(data.ReactiveInsights, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1SearchInsightsCommandError = 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) {
@@ -2841,14 +2727,14 @@ var deserializeAws_restJson1SearchInsightsCommandError = 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];
         }
     });
 }); };
@@ -2860,32 +2746,29 @@ export var deserializeAws_restJson1SearchOrganizationInsightsCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1SearchOrganizationInsightsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    ProactiveInsights: undefined,
-                    ReactiveInsights: 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.ProactiveInsights !== undefined && data.ProactiveInsights !== null) {
+                if (data.ProactiveInsights != null) {
                     contents.ProactiveInsights = deserializeAws_restJson1ProactiveInsights(data.ProactiveInsights, context);
                 }
-                if (data.ReactiveInsights !== undefined && data.ReactiveInsights !== null) {
+                if (data.ReactiveInsights != null) {
                     contents.ReactiveInsights = deserializeAws_restJson1ReactiveInsights(data.ReactiveInsights, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1SearchOrganizationInsightsCommandError = 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) {
@@ -2918,14 +2801,14 @@ var deserializeAws_restJson1SearchOrganizationInsightsCommandError = function (o
             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];
         }
     });
 }); };
@@ -2937,18 +2820,18 @@ export var deserializeAws_restJson1StartCostEstimationCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StartCostEstimationCommandError(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_restJson1StartCostEstimationCommandError = 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) {
@@ -2989,14 +2872,14 @@ var deserializeAws_restJson1StartCostEstimationCommandError = function (output,
             case 13: throw _d.sent();
             case 14:
                 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 = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -3008,18 +2891,18 @@ export var deserializeAws_restJson1UpdateEventSourcesConfigCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateEventSourcesConfigCommandError(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_restJson1UpdateEventSourcesConfigCommandError = 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) {
@@ -3052,14 +2935,14 @@ var deserializeAws_restJson1UpdateEventSourcesConfigCommandError = function (out
             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];
         }
     });
 }); };
@@ -3071,18 +2954,18 @@ export var deserializeAws_restJson1UpdateResourceCollectionCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateResourceCollectionCommandError(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_restJson1UpdateResourceCollectionCommandError = 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) {
@@ -3119,14 +3002,14 @@ var deserializeAws_restJson1UpdateResourceCollectionCommandError = function (out
             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];
         }
     });
 }); };
@@ -3138,18 +3021,18 @@ export var deserializeAws_restJson1UpdateServiceIntegrationCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateServiceIntegrationCommandError(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_restJson1UpdateServiceIntegrationCommandError = 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) {
@@ -3186,23 +3069,24 @@ var deserializeAws_restJson1UpdateServiceIntegrationCommandError = function (out
             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];
         }
     });
 }); };
+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));
@@ -3212,15 +3096,15 @@ 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);
         }
-        if (data.ResourceId !== undefined && data.ResourceId !== null) {
+        if (data.ResourceId != null) {
             contents.ResourceId = __expectString(data.ResourceId);
         }
-        if (data.ResourceType !== undefined && data.ResourceType !== null) {
+        if (data.ResourceType != null) {
             contents.ResourceType = __expectString(data.ResourceType);
         }
         exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3230,12 +3114,14 @@ 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 = {};
-        if (parsedOutput.headers["retry-after"] !== undefined) {
-            contents.RetryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
-        }
+        contents = map({
+            RetryAfterSeconds: [
+                function () { return void 0 !== parsedOutput.headers["retry-after"]; },
+                function () { return __strictParseInt32(parsedOutput.headers["retry-after"]); },
+            ],
+        });
         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));
@@ -3245,15 +3131,15 @@ 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);
         }
-        if (data.ResourceId !== undefined && data.ResourceId !== null) {
+        if (data.ResourceId != null) {
             contents.ResourceId = __expectString(data.ResourceId);
         }
-        if (data.ResourceType !== undefined && data.ResourceType !== null) {
+        if (data.ResourceType != null) {
             contents.ResourceType = __expectString(data.ResourceType);
         }
         exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3263,9 +3149,9 @@ var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsed
 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));
@@ -3275,18 +3161,20 @@ 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 = {};
-        if (parsedOutput.headers["retry-after"] !== undefined) {
-            contents.RetryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
-        }
+        contents = map({
+            RetryAfterSeconds: [
+                function () { return void 0 !== parsedOutput.headers["retry-after"]; },
+                function () { return __strictParseInt32(parsedOutput.headers["retry-after"]); },
+            ],
+        });
         data = parsedOutput.body;
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
-        if (data.QuotaCode !== undefined && data.QuotaCode !== null) {
+        if (data.QuotaCode != null) {
             contents.QuotaCode = __expectString(data.QuotaCode);
         }
-        if (data.ServiceCode !== undefined && data.ServiceCode !== null) {
+        if (data.ServiceCode != null) {
             contents.ServiceCode = __expectString(data.ServiceCode);
         }
         exception = new ThrottlingException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3296,15 +3184,15 @@ 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.Fields !== undefined && data.Fields !== null) {
+        if (data.Fields != null) {
             contents.Fields = deserializeAws_restJson1ValidationExceptionFields(data.Fields, context);
         }
-        if (data.Message !== undefined && data.Message !== null) {
+        if (data.Message != null) {
             contents.Message = __expectString(data.Message);
         }
-        if (data.Reason !== undefined && data.Reason !== null) {
+        if (data.Reason != null) {
             contents.Reason = __expectString(data.Reason);
         }
         exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3315,9 +3203,6 @@ var serializeAws_restJson1AccountIdList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3343,9 +3228,6 @@ var serializeAws_restJson1CostEstimationStackNames = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3353,9 +3235,6 @@ var serializeAws_restJson1CostEstimationTagValues = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3377,9 +3256,6 @@ var serializeAws_restJson1InsightSeverities = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3387,9 +3263,6 @@ var serializeAws_restJson1InsightStatuses = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3404,9 +3277,6 @@ var serializeAws_restJson1ListInsightsAccountIdList = function (input, context)
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3427,9 +3297,6 @@ var serializeAws_restJson1ListInsightsOrganizationalUnitIdList = function (input
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3458,9 +3325,6 @@ var serializeAws_restJson1OrganizationalUnitIdList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3473,9 +3337,6 @@ var serializeAws_restJson1ResourceTypeFilters = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3483,9 +3344,6 @@ var serializeAws_restJson1SearchInsightsAccountIdList = function (input, context
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3512,9 +3370,6 @@ var serializeAws_restJson1ServiceNames = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3525,9 +3380,6 @@ var serializeAws_restJson1StackNames = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3541,9 +3393,6 @@ var serializeAws_restJson1TagCollections = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1TagCollection(entry, context);
     });
 };
@@ -3556,9 +3405,6 @@ var serializeAws_restJson1TagCostEstimationResourceCollectionFilters = function
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1TagCostEstimationResourceCollectionFilter(entry, context);
     });
 };
@@ -3566,9 +3412,6 @@ var serializeAws_restJson1TagValues = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3591,9 +3434,6 @@ var serializeAws_restJson1UpdateStackNames = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3604,9 +3444,6 @@ var serializeAws_restJson1UpdateTagCollectionFilters = function (input, context)
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1UpdateTagCollectionFilter(entry, context);
     });
 };
@@ -3614,9 +3451,6 @@ var serializeAws_restJson1UpdateTagValues = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };