@aws-sdk/client-elasticsearch-service 3.137.0 → 3.142.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,10 +1,10 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, 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, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, 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, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { ElasticsearchServiceServiceException as __BaseException } from "../models/ElasticsearchServiceServiceException";
 import { AccessDeniedException, BaseException, ConflictException, DisabledOperationException, InternalException, InvalidPaginationTokenException, InvalidTypeException, LimitExceededException, ResourceAlreadyExistsException, ResourceNotFoundException, ValidationException, } from "../models/models_0";
 export var serializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -13,16 +13,7 @@ export var serializeAws_restJson1AcceptInboundCrossClusterSearchConnectionComman
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/ccs/inboundConnection/{CrossClusterSearchConnectionId}/accept";
-                if (input.CrossClusterSearchConnectionId !== undefined) {
-                    labelValue = input.CrossClusterSearchConnectionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: CrossClusterSearchConnectionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "CrossClusterSearchConnectionId", function () { return input.CrossClusterSearchConnectionId; }, "{CrossClusterSearchConnectionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -60,7 +51,7 @@ export var serializeAws_restJson1AddTagsCommand = function (input, context) { re
     });
 }); };
 export var serializeAws_restJson1AssociatePackageCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, 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()];
@@ -69,26 +60,8 @@ export var serializeAws_restJson1AssociatePackageCommand = function (input, cont
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/packages/associate/{PackageID}/{DomainName}";
-                if (input.PackageID !== undefined) {
-                    labelValue = input.PackageID;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: PackageID.");
-                    }
-                    resolvedPath = resolvedPath.replace("{PackageID}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: PackageID.");
-                }
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "PackageID", function () { return input.PackageID; }, "{PackageID}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -225,7 +198,7 @@ export var serializeAws_restJson1CreatePackageCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1DeleteElasticsearchDomainCommand = 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()];
@@ -233,16 +206,7 @@ export var serializeAws_restJson1DeleteElasticsearchDomainCommand = 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 || "") + "/2015-01-01/es/domain/{DomainName}";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -280,7 +244,7 @@ export var serializeAws_restJson1DeleteElasticsearchServiceRoleCommand = functio
     });
 }); };
 export var serializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand = 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()];
@@ -289,16 +253,7 @@ export var serializeAws_restJson1DeleteInboundCrossClusterSearchConnectionComman
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/ccs/inboundConnection/{CrossClusterSearchConnectionId}";
-                if (input.CrossClusterSearchConnectionId !== undefined) {
-                    labelValue = input.CrossClusterSearchConnectionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: CrossClusterSearchConnectionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "CrossClusterSearchConnectionId", function () { return input.CrossClusterSearchConnectionId; }, "{CrossClusterSearchConnectionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -312,7 +267,7 @@ export var serializeAws_restJson1DeleteInboundCrossClusterSearchConnectionComman
     });
 }); };
 export var serializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand = 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()];
@@ -321,16 +276,7 @@ export var serializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionComma
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/ccs/outboundConnection/{CrossClusterSearchConnectionId}";
-                if (input.CrossClusterSearchConnectionId !== undefined) {
-                    labelValue = input.CrossClusterSearchConnectionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: CrossClusterSearchConnectionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "CrossClusterSearchConnectionId", function () { return input.CrossClusterSearchConnectionId; }, "{CrossClusterSearchConnectionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -344,7 +290,7 @@ export var serializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionComma
     });
 }); };
 export var serializeAws_restJson1DeletePackageCommand = 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()];
@@ -352,16 +298,7 @@ export var serializeAws_restJson1DeletePackageCommand = 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 || "") + "/2015-01-01/packages/{PackageID}";
-                if (input.PackageID !== undefined) {
-                    labelValue = input.PackageID;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: PackageID.");
-                    }
-                    resolvedPath = resolvedPath.replace("{PackageID}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: PackageID.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "PackageID", function () { return input.PackageID; }, "{PackageID}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -375,7 +312,7 @@ export var serializeAws_restJson1DeletePackageCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1DescribeDomainAutoTunesCommand = 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()];
@@ -386,16 +323,7 @@ export var serializeAws_restJson1DescribeDomainAutoTunesCommand = function (inpu
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/domain/{DomainName}/autoTunes";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.MaxResults != null && { MaxResults: input.MaxResults })), (input.NextToken != null && { NextToken: input.NextToken })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -410,7 +338,7 @@ export var serializeAws_restJson1DescribeDomainAutoTunesCommand = function (inpu
     });
 }); };
 export var serializeAws_restJson1DescribeDomainChangeProgressCommand = 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()];
@@ -419,17 +347,10 @@ export var serializeAws_restJson1DescribeDomainChangeProgressCommand = function
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/domain/{DomainName}/progress";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
-                query = __assign({}, (input.ChangeId !== undefined && { changeid: input.ChangeId }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
+                query = map({
+                    changeid: [, input.ChangeId],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -444,7 +365,7 @@ export var serializeAws_restJson1DescribeDomainChangeProgressCommand = function
     });
 }); };
 export var serializeAws_restJson1DescribeElasticsearchDomainCommand = 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()];
@@ -452,16 +373,7 @@ export var serializeAws_restJson1DescribeElasticsearchDomainCommand = function (
                 _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 || "") + "/2015-01-01/es/domain/{DomainName}";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -475,7 +387,7 @@ export var serializeAws_restJson1DescribeElasticsearchDomainCommand = function (
     });
 }); };
 export var serializeAws_restJson1DescribeElasticsearchDomainConfigCommand = 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()];
@@ -483,16 +395,7 @@ export var serializeAws_restJson1DescribeElasticsearchDomainConfigCommand = func
                 _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 || "") + "/2015-01-01/es/domain/{DomainName}/config";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -530,7 +433,7 @@ export var serializeAws_restJson1DescribeElasticsearchDomainsCommand = function
     });
 }); };
 export var serializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, 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()];
@@ -539,27 +442,11 @@ export var serializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/instanceTypeLimits/{ElasticsearchVersion}/{InstanceType}";
-                if (input.InstanceType !== undefined) {
-                    labelValue = input.InstanceType;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: InstanceType.");
-                    }
-                    resolvedPath = resolvedPath.replace("{InstanceType}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: InstanceType.");
-                }
-                if (input.ElasticsearchVersion !== undefined) {
-                    labelValue = input.ElasticsearchVersion;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ElasticsearchVersion.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ElasticsearchVersion}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ElasticsearchVersion.");
-                }
-                query = __assign({}, (input.DomainName !== undefined && { domainName: input.DomainName }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "InstanceType", function () { return input.InstanceType; }, "{InstanceType}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "ElasticsearchVersion", function () { return input.ElasticsearchVersion; }, "{ElasticsearchVersion}", false);
+                query = map({
+                    domainName: [, input.DomainName],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -656,9 +543,11 @@ export var serializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsC
                 _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 || "") + "/2015-01-01/es/reservedInstanceOfferings";
-                query = __assign(__assign(__assign({}, (input.ReservedElasticsearchInstanceOfferingId !== undefined && {
-                    offeringId: input.ReservedElasticsearchInstanceOfferingId,
-                })), (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                query = map({
+                    offeringId: [, input.ReservedElasticsearchInstanceOfferingId],
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -681,9 +570,11 @@ export var serializeAws_restJson1DescribeReservedElasticsearchInstancesCommand =
                 _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 || "") + "/2015-01-01/es/reservedInstances";
-                query = __assign(__assign(__assign({}, (input.ReservedElasticsearchInstanceId !== undefined && {
-                    reservationId: input.ReservedElasticsearchInstanceId,
-                })), (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                query = map({
+                    reservationId: [, input.ReservedElasticsearchInstanceId],
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -698,7 +589,7 @@ export var serializeAws_restJson1DescribeReservedElasticsearchInstancesCommand =
     });
 }); };
 export var serializeAws_restJson1DissociatePackageCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, 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()];
@@ -707,26 +598,8 @@ export var serializeAws_restJson1DissociatePackageCommand = function (input, con
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/packages/dissociate/{PackageID}/{DomainName}";
-                if (input.PackageID !== undefined) {
-                    labelValue = input.PackageID;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: PackageID.");
-                    }
-                    resolvedPath = resolvedPath.replace("{PackageID}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: PackageID.");
-                }
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "PackageID", function () { return input.PackageID; }, "{PackageID}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -748,7 +621,9 @@ export var serializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = fun
                 _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 || "") + "/2015-01-01/es/compatibleVersions";
-                query = __assign({}, (input.DomainName !== undefined && { domainName: input.DomainName }));
+                query = map({
+                    domainName: [, input.DomainName],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -763,7 +638,7 @@ export var serializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = fun
     });
 }); };
 export var serializeAws_restJson1GetPackageVersionHistoryCommand = 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()];
@@ -771,17 +646,11 @@ export var serializeAws_restJson1GetPackageVersionHistoryCommand = function (inp
                 _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 || "") + "/2015-01-01/packages/{PackageID}/history";
-                if (input.PackageID !== undefined) {
-                    labelValue = input.PackageID;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: PackageID.");
-                    }
-                    resolvedPath = resolvedPath.replace("{PackageID}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: PackageID.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "PackageID", function () { return input.PackageID; }, "{PackageID}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -796,7 +665,7 @@ export var serializeAws_restJson1GetPackageVersionHistoryCommand = function (inp
     });
 }); };
 export var serializeAws_restJson1GetUpgradeHistoryCommand = 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()];
@@ -805,17 +674,11 @@ export var serializeAws_restJson1GetUpgradeHistoryCommand = function (input, con
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/upgradeDomain/{DomainName}/history";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -830,7 +693,7 @@ export var serializeAws_restJson1GetUpgradeHistoryCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1GetUpgradeStatusCommand = 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()];
@@ -839,16 +702,7 @@ export var serializeAws_restJson1GetUpgradeStatusCommand = function (input, cont
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/upgradeDomain/{DomainName}/status";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -870,7 +724,9 @@ export var serializeAws_restJson1ListDomainNamesCommand = 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 || "") + "/2015-01-01/domain";
-                query = __assign({}, (input.EngineType !== undefined && { engineType: input.EngineType }));
+                query = map({
+                    engineType: [, input.EngineType],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -885,7 +741,7 @@ export var serializeAws_restJson1ListDomainNamesCommand = function (input, conte
     });
 }); };
 export var serializeAws_restJson1ListDomainsForPackageCommand = 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()];
@@ -893,17 +749,11 @@ export var serializeAws_restJson1ListDomainsForPackageCommand = function (input,
                 _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 || "") + "/2015-01-01/packages/{PackageID}/domains";
-                if (input.PackageID !== undefined) {
-                    labelValue = input.PackageID;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: PackageID.");
-                    }
-                    resolvedPath = resolvedPath.replace("{PackageID}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: PackageID.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "PackageID", function () { return input.PackageID; }, "{PackageID}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -918,7 +768,7 @@ export var serializeAws_restJson1ListDomainsForPackageCommand = function (input,
     });
 }); };
 export var serializeAws_restJson1ListElasticsearchInstanceTypesCommand = 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()];
@@ -927,17 +777,12 @@ export var serializeAws_restJson1ListElasticsearchInstanceTypesCommand = functio
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/instanceTypes/{ElasticsearchVersion}";
-                if (input.ElasticsearchVersion !== undefined) {
-                    labelValue = input.ElasticsearchVersion;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ElasticsearchVersion.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ElasticsearchVersion}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ElasticsearchVersion.");
-                }
-                query = __assign(__assign(__assign({}, (input.DomainName !== undefined && { domainName: input.DomainName })), (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ElasticsearchVersion", function () { return input.ElasticsearchVersion; }, "{ElasticsearchVersion}", false);
+                query = map({
+                    domainName: [, input.DomainName],
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -960,7 +805,10 @@ export var serializeAws_restJson1ListElasticsearchVersionsCommand = 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 || "") + "/2015-01-01/es/versions";
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -975,7 +823,7 @@ export var serializeAws_restJson1ListElasticsearchVersionsCommand = function (in
     });
 }); };
 export var serializeAws_restJson1ListPackagesForDomainCommand = 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()];
@@ -983,17 +831,11 @@ export var serializeAws_restJson1ListPackagesForDomainCommand = function (input,
                 _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 || "") + "/2015-01-01/domain/{DomainName}/packages";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1016,7 +858,9 @@ export var serializeAws_restJson1ListTagsCommand = function (input, context) { r
                 _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 || "") + "/2015-01-01/tags";
-                query = __assign({}, (input.ARN !== undefined && { arn: input.ARN }));
+                query = map({
+                    arn: [, input.ARN],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1058,7 +902,7 @@ export var serializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCo
     });
 }); };
 export var serializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand = 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()];
@@ -1067,16 +911,7 @@ export var serializeAws_restJson1RejectInboundCrossClusterSearchConnectionComman
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/2015-01-01/es/ccs/inboundConnection/{CrossClusterSearchConnectionId}/reject";
-                if (input.CrossClusterSearchConnectionId !== undefined) {
-                    labelValue = input.CrossClusterSearchConnectionId;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: CrossClusterSearchConnectionId.");
-                    }
-                    resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "CrossClusterSearchConnectionId", function () { return input.CrossClusterSearchConnectionId; }, "{CrossClusterSearchConnectionId}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1139,7 +974,7 @@ export var serializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommand
     });
 }); };
 export var serializeAws_restJson1UpdateElasticsearchDomainConfigCommand = 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()];
@@ -1149,16 +984,7 @@ export var serializeAws_restJson1UpdateElasticsearchDomainConfigCommand = functi
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/2015-01-01/es/domain/{DomainName}/config";
-                if (input.DomainName !== undefined) {
-                    labelValue = input.DomainName;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: DomainName.");
-                    }
-                    resolvedPath = resolvedPath.replace("{DomainName}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: DomainName.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "DomainName", function () { return input.DomainName; }, "{DomainName}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.AccessPolicies != null && { AccessPolicies: input.AccessPolicies })), (input.AdvancedOptions != null && {
                     AdvancedOptions: serializeAws_restJson1AdvancedOptions(input.AdvancedOptions, context),
                 })), (input.AdvancedSecurityOptions != null && {
@@ -1250,24 +1076,23 @@ export var deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionComm
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CrossClusterSearchConnection: 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.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
+                if (data.CrossClusterSearchConnection != null) {
                     contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommandError = 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) {
@@ -1296,14 +1121,14 @@ var deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommandErro
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -1315,18 +1140,18 @@ export var deserializeAws_restJson1AddTagsCommand = function (output, context) {
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AddTagsCommandError(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_restJson1AddTagsCommandError = 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) {
@@ -1359,14 +1184,14 @@ var deserializeAws_restJson1AddTagsCommandError = function (output, context) { r
             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];
         }
     });
 }); };
@@ -1378,24 +1203,23 @@ export var deserializeAws_restJson1AssociatePackageCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AssociatePackageCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainPackageDetails: 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.DomainPackageDetails !== undefined && data.DomainPackageDetails !== null) {
+                if (data.DomainPackageDetails != null) {
                     contents.DomainPackageDetails = deserializeAws_restJson1DomainPackageDetails(data.DomainPackageDetails, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1AssociatePackageCommandError = 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) {
@@ -1436,14 +1260,14 @@ var deserializeAws_restJson1AssociatePackageCommandError = function (output, con
             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];
         }
     });
 }); };
@@ -1455,24 +1279,23 @@ export var deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateComma
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ServiceSoftwareOptions: 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.ServiceSoftwareOptions !== undefined && data.ServiceSoftwareOptions !== null) {
+                if (data.ServiceSoftwareOptions != null) {
                     contents.ServiceSoftwareOptions = deserializeAws_restJson1ServiceSoftwareOptions(data.ServiceSoftwareOptions, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandError = 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) {
@@ -1505,14 +1328,14 @@ var deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandError
             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];
         }
     });
 }); };
@@ -1524,24 +1347,23 @@ export var deserializeAws_restJson1CreateElasticsearchDomainCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateElasticsearchDomainCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainStatus: 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.DomainStatus !== undefined && data.DomainStatus !== null) {
+                if (data.DomainStatus != null) {
                     contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateElasticsearchDomainCommandError = 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) {
@@ -1586,14 +1408,14 @@ var deserializeAws_restJson1CreateElasticsearchDomainCommandError = function (ou
             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];
         }
     });
 }); };
@@ -1605,40 +1427,35 @@ export var deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCom
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ConnectionAlias: undefined,
-                    ConnectionStatus: undefined,
-                    CrossClusterSearchConnectionId: undefined,
-                    DestinationDomainInfo: undefined,
-                    SourceDomainInfo: 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.ConnectionAlias !== undefined && data.ConnectionAlias !== null) {
+                if (data.ConnectionAlias != null) {
                     contents.ConnectionAlias = __expectString(data.ConnectionAlias);
                 }
-                if (data.ConnectionStatus !== undefined && data.ConnectionStatus !== null) {
+                if (data.ConnectionStatus != null) {
                     contents.ConnectionStatus = deserializeAws_restJson1OutboundCrossClusterSearchConnectionStatus(data.ConnectionStatus, context);
                 }
-                if (data.CrossClusterSearchConnectionId !== undefined && data.CrossClusterSearchConnectionId !== null) {
+                if (data.CrossClusterSearchConnectionId != null) {
                     contents.CrossClusterSearchConnectionId = __expectString(data.CrossClusterSearchConnectionId);
                 }
-                if (data.DestinationDomainInfo !== undefined && data.DestinationDomainInfo !== null) {
+                if (data.DestinationDomainInfo != null) {
                     contents.DestinationDomainInfo = deserializeAws_restJson1DomainInformation(data.DestinationDomainInfo, context);
                 }
-                if (data.SourceDomainInfo !== undefined && data.SourceDomainInfo !== null) {
+                if (data.SourceDomainInfo != null) {
                     contents.SourceDomainInfo = deserializeAws_restJson1DomainInformation(data.SourceDomainInfo, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandError = 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) {
@@ -1671,14 +1488,14 @@ var deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandErr
             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];
         }
     });
 }); };
@@ -1690,24 +1507,23 @@ export var deserializeAws_restJson1CreatePackageCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreatePackageCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    PackageDetails: 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.PackageDetails !== undefined && data.PackageDetails !== null) {
+                if (data.PackageDetails != null) {
                     contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreatePackageCommandError = 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) {
@@ -1752,14 +1568,14 @@ var deserializeAws_restJson1CreatePackageCommandError = function (output, contex
             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];
         }
     });
 }); };
@@ -1771,24 +1587,23 @@ export var deserializeAws_restJson1DeleteElasticsearchDomainCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteElasticsearchDomainCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainStatus: 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.DomainStatus !== undefined && data.DomainStatus !== null) {
+                if (data.DomainStatus != null) {
                     contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteElasticsearchDomainCommandError = 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) {
@@ -1821,14 +1636,14 @@ var deserializeAws_restJson1DeleteElasticsearchDomainCommandError = function (ou
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1840,18 +1655,18 @@ export var deserializeAws_restJson1DeleteElasticsearchServiceRoleCommand = funct
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteElasticsearchServiceRoleCommandError(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_restJson1DeleteElasticsearchServiceRoleCommandError = 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) {
@@ -1880,14 +1695,14 @@ var deserializeAws_restJson1DeleteElasticsearchServiceRoleCommandError = functio
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -1899,24 +1714,23 @@ export var deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionComm
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CrossClusterSearchConnection: 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.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
+                if (data.CrossClusterSearchConnection != null) {
                     contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandError = 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) {
@@ -1941,14 +1755,14 @@ var deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandErro
             case 5: throw _d.sent();
             case 6:
                 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 = 7;
+            case 7: return [2];
         }
     });
 }); };
@@ -1960,24 +1774,23 @@ export var deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCom
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CrossClusterSearchConnection: 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.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
+                if (data.CrossClusterSearchConnection != null) {
                     contents.CrossClusterSearchConnection = deserializeAws_restJson1OutboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandError = 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) {
@@ -2002,14 +1815,14 @@ var deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandErr
             case 5: throw _d.sent();
             case 6:
                 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 = 7;
+            case 7: return [2];
         }
     });
 }); };
@@ -2021,24 +1834,23 @@ export var deserializeAws_restJson1DeletePackageCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeletePackageCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    PackageDetails: 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.PackageDetails !== undefined && data.PackageDetails !== null) {
+                if (data.PackageDetails != null) {
                     contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeletePackageCommandError = 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) {
@@ -2079,14 +1891,14 @@ var deserializeAws_restJson1DeletePackageCommandError = 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];
         }
     });
 }); };
@@ -2098,28 +1910,26 @@ export var deserializeAws_restJson1DescribeDomainAutoTunesCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeDomainAutoTunesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    AutoTunes: 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.AutoTunes !== undefined && data.AutoTunes !== null) {
+                if (data.AutoTunes != null) {
                     contents.AutoTunes = deserializeAws_restJson1AutoTuneList(data.AutoTunes, 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_restJson1DescribeDomainAutoTunesCommandError = 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) {
@@ -2152,14 +1962,14 @@ var deserializeAws_restJson1DescribeDomainAutoTunesCommandError = 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];
         }
     });
 }); };
@@ -2171,24 +1981,23 @@ export var deserializeAws_restJson1DescribeDomainChangeProgressCommand = functio
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeDomainChangeProgressCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ChangeProgressStatus: 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.ChangeProgressStatus !== undefined && data.ChangeProgressStatus !== null) {
+                if (data.ChangeProgressStatus != null) {
                     contents.ChangeProgressStatus = deserializeAws_restJson1ChangeProgressStatusDetails(data.ChangeProgressStatus, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeDomainChangeProgressCommandError = 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) {
@@ -2221,14 +2030,14 @@ var deserializeAws_restJson1DescribeDomainChangeProgressCommandError = 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];
         }
     });
 }); };
@@ -2240,24 +2049,23 @@ export var deserializeAws_restJson1DescribeElasticsearchDomainCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeElasticsearchDomainCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainStatus: 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.DomainStatus !== undefined && data.DomainStatus !== null) {
+                if (data.DomainStatus != null) {
                     contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeElasticsearchDomainCommandError = 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) {
@@ -2290,14 +2098,14 @@ var deserializeAws_restJson1DescribeElasticsearchDomainCommandError = 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];
         }
     });
 }); };
@@ -2309,24 +2117,23 @@ export var deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand = fu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainConfig: 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.DomainConfig !== undefined && data.DomainConfig !== null) {
+                if (data.DomainConfig != null) {
                     contents.DomainConfig = deserializeAws_restJson1ElasticsearchDomainConfig(data.DomainConfig, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError = 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) {
@@ -2359,14 +2166,14 @@ var deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError = func
             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];
         }
     });
 }); };
@@ -2378,24 +2185,23 @@ export var deserializeAws_restJson1DescribeElasticsearchDomainsCommand = functio
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeElasticsearchDomainsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainStatusList: 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.DomainStatusList !== undefined && data.DomainStatusList !== null) {
+                if (data.DomainStatusList != null) {
                     contents.DomainStatusList = deserializeAws_restJson1ElasticsearchDomainStatusList(data.DomainStatusList, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeElasticsearchDomainsCommandError = 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) {
@@ -2424,14 +2230,14 @@ var deserializeAws_restJson1DescribeElasticsearchDomainsCommandError = function
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -2443,24 +2249,23 @@ export var deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsComman
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    LimitsByRole: 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.LimitsByRole !== undefined && data.LimitsByRole !== null) {
+                if (data.LimitsByRole != null) {
                     contents.LimitsByRole = deserializeAws_restJson1LimitsByRole(data.LimitsByRole, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandError = 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) {
@@ -2501,14 +2306,14 @@ var deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandError
             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];
         }
     });
 }); };
@@ -2520,28 +2325,26 @@ export var deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsC
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CrossClusterSearchConnections: 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.CrossClusterSearchConnections !== undefined && data.CrossClusterSearchConnections !== null) {
+                if (data.CrossClusterSearchConnections != null) {
                     contents.CrossClusterSearchConnections = deserializeAws_restJson1InboundCrossClusterSearchConnections(data.CrossClusterSearchConnections, 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_restJson1DescribeInboundCrossClusterSearchConnectionsCommandError = 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) {
@@ -2566,14 +2369,14 @@ var deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommandE
             case 5: throw _d.sent();
             case 6:
                 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 = 7;
+            case 7: return [2];
         }
     });
 }); };
@@ -2585,28 +2388,26 @@ export var deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnections
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CrossClusterSearchConnections: 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.CrossClusterSearchConnections !== undefined && data.CrossClusterSearchConnections !== null) {
+                if (data.CrossClusterSearchConnections != null) {
                     contents.CrossClusterSearchConnections = deserializeAws_restJson1OutboundCrossClusterSearchConnections(data.CrossClusterSearchConnections, 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_restJson1DescribeOutboundCrossClusterSearchConnectionsCommandError = 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) {
@@ -2631,14 +2432,14 @@ var deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommand
             case 5: throw _d.sent();
             case 6:
                 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 = 7;
+            case 7: return [2];
         }
     });
 }); };
@@ -2650,28 +2451,26 @@ export var deserializeAws_restJson1DescribePackagesCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribePackagesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    PackageDetailsList: 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.PackageDetailsList !== undefined && data.PackageDetailsList !== null) {
+                if (data.PackageDetailsList != null) {
                     contents.PackageDetailsList = deserializeAws_restJson1PackageDetailsList(data.PackageDetailsList, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribePackagesCommandError = 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) {
@@ -2708,14 +2507,14 @@ var deserializeAws_restJson1DescribePackagesCommandError = 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];
         }
     });
 }); };
@@ -2727,29 +2526,26 @@ export var deserializeAws_restJson1DescribeReservedElasticsearchInstanceOffering
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    ReservedElasticsearchInstanceOfferings: 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.ReservedElasticsearchInstanceOfferings !== undefined &&
-                    data.ReservedElasticsearchInstanceOfferings !== null) {
+                if (data.ReservedElasticsearchInstanceOfferings != null) {
                     contents.ReservedElasticsearchInstanceOfferings = deserializeAws_restJson1ReservedElasticsearchInstanceOfferingList(data.ReservedElasticsearchInstanceOfferings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommandError = 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) {
@@ -2782,14 +2578,14 @@ var deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsComman
             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];
         }
     });
 }); };
@@ -2801,28 +2597,26 @@ export var deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    ReservedElasticsearchInstances: 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.ReservedElasticsearchInstances !== undefined && data.ReservedElasticsearchInstances !== null) {
+                if (data.ReservedElasticsearchInstances != null) {
                     contents.ReservedElasticsearchInstances = deserializeAws_restJson1ReservedElasticsearchInstanceList(data.ReservedElasticsearchInstances, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError = 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) {
@@ -2855,14 +2649,14 @@ var deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError =
             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];
         }
     });
 }); };
@@ -2874,24 +2668,23 @@ export var deserializeAws_restJson1DissociatePackageCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DissociatePackageCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainPackageDetails: 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.DomainPackageDetails !== undefined && data.DomainPackageDetails !== null) {
+                if (data.DomainPackageDetails != null) {
                     contents.DomainPackageDetails = deserializeAws_restJson1DomainPackageDetails(data.DomainPackageDetails, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DissociatePackageCommandError = 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) {
@@ -2932,14 +2725,14 @@ var deserializeAws_restJson1DissociatePackageCommandError = function (output, co
             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];
         }
     });
 }); };
@@ -2951,24 +2744,23 @@ export var deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = f
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CompatibleElasticsearchVersions: 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.CompatibleElasticsearchVersions !== undefined && data.CompatibleElasticsearchVersions !== null) {
+                if (data.CompatibleElasticsearchVersions != null) {
                     contents.CompatibleElasticsearchVersions = deserializeAws_restJson1CompatibleElasticsearchVersionsList(data.CompatibleElasticsearchVersions, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError = 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) {
@@ -3005,14 +2797,14 @@ var deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError = fun
             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];
         }
     });
 }); };
@@ -3024,32 +2816,29 @@ export var deserializeAws_restJson1GetPackageVersionHistoryCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetPackageVersionHistoryCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    PackageID: undefined,
-                    PackageVersionHistoryList: 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.PackageID !== undefined && data.PackageID !== null) {
+                if (data.PackageID != null) {
                     contents.PackageID = __expectString(data.PackageID);
                 }
-                if (data.PackageVersionHistoryList !== undefined && data.PackageVersionHistoryList !== null) {
+                if (data.PackageVersionHistoryList != null) {
                     contents.PackageVersionHistoryList = deserializeAws_restJson1PackageVersionHistoryList(data.PackageVersionHistoryList, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetPackageVersionHistoryCommandError = 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) {
@@ -3086,14 +2875,14 @@ var deserializeAws_restJson1GetPackageVersionHistoryCommandError = 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];
         }
     });
 }); };
@@ -3105,28 +2894,26 @@ export var deserializeAws_restJson1GetUpgradeHistoryCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetUpgradeHistoryCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    UpgradeHistories: 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.UpgradeHistories !== undefined && data.UpgradeHistories !== null) {
+                if (data.UpgradeHistories != null) {
                     contents.UpgradeHistories = deserializeAws_restJson1UpgradeHistoryList(data.UpgradeHistories, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetUpgradeHistoryCommandError = 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) {
@@ -3163,14 +2950,14 @@ var deserializeAws_restJson1GetUpgradeHistoryCommandError = 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];
         }
     });
 }); };
@@ -3182,32 +2969,29 @@ export var deserializeAws_restJson1GetUpgradeStatusCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetUpgradeStatusCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    StepStatus: undefined,
-                    UpgradeName: undefined,
-                    UpgradeStep: 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.StepStatus !== undefined && data.StepStatus !== null) {
+                if (data.StepStatus != null) {
                     contents.StepStatus = __expectString(data.StepStatus);
                 }
-                if (data.UpgradeName !== undefined && data.UpgradeName !== null) {
+                if (data.UpgradeName != null) {
                     contents.UpgradeName = __expectString(data.UpgradeName);
                 }
-                if (data.UpgradeStep !== undefined && data.UpgradeStep !== null) {
+                if (data.UpgradeStep != null) {
                     contents.UpgradeStep = __expectString(data.UpgradeStep);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetUpgradeStatusCommandError = 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) {
@@ -3244,14 +3028,14 @@ var deserializeAws_restJson1GetUpgradeStatusCommandError = 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];
         }
     });
 }); };
@@ -3263,24 +3047,23 @@ export var deserializeAws_restJson1ListDomainNamesCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListDomainNamesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainNames: 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.DomainNames !== undefined && data.DomainNames !== null) {
+                if (data.DomainNames != null) {
                     contents.DomainNames = deserializeAws_restJson1DomainInfoList(data.DomainNames, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListDomainNamesCommandError = 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) {
@@ -3305,14 +3088,14 @@ var deserializeAws_restJson1ListDomainNamesCommandError = function (output, cont
             case 5: throw _d.sent();
             case 6:
                 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 = 7;
+            case 7: return [2];
         }
     });
 }); };
@@ -3324,28 +3107,26 @@ export var deserializeAws_restJson1ListDomainsForPackageCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListDomainsForPackageCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainPackageDetailsList: 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.DomainPackageDetailsList !== undefined && data.DomainPackageDetailsList !== null) {
+                if (data.DomainPackageDetailsList != null) {
                     contents.DomainPackageDetailsList = deserializeAws_restJson1DomainPackageDetailsList(data.DomainPackageDetailsList, 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_restJson1ListDomainsForPackageCommandError = 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) {
@@ -3382,14 +3163,14 @@ var deserializeAws_restJson1ListDomainsForPackageCommandError = 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];
         }
     });
 }); };
@@ -3401,28 +3182,26 @@ export var deserializeAws_restJson1ListElasticsearchInstanceTypesCommand = funct
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListElasticsearchInstanceTypesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ElasticsearchInstanceTypes: 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.ElasticsearchInstanceTypes !== undefined && data.ElasticsearchInstanceTypes !== null) {
+                if (data.ElasticsearchInstanceTypes != null) {
                     contents.ElasticsearchInstanceTypes = deserializeAws_restJson1ElasticsearchInstanceTypeList(data.ElasticsearchInstanceTypes, 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_restJson1ListElasticsearchInstanceTypesCommandError = 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) {
@@ -3455,14 +3234,14 @@ var deserializeAws_restJson1ListElasticsearchInstanceTypesCommandError = functio
             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];
         }
     });
 }); };
@@ -3474,28 +3253,26 @@ export var deserializeAws_restJson1ListElasticsearchVersionsCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListElasticsearchVersionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ElasticsearchVersions: 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.ElasticsearchVersions !== undefined && data.ElasticsearchVersions !== null) {
+                if (data.ElasticsearchVersions != null) {
                     contents.ElasticsearchVersions = deserializeAws_restJson1ElasticsearchVersionList(data.ElasticsearchVersions, 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_restJson1ListElasticsearchVersionsCommandError = 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) {
@@ -3528,14 +3305,14 @@ var deserializeAws_restJson1ListElasticsearchVersionsCommandError = function (ou
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -3547,28 +3324,26 @@ export var deserializeAws_restJson1ListPackagesForDomainCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListPackagesForDomainCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainPackageDetailsList: 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.DomainPackageDetailsList !== undefined && data.DomainPackageDetailsList !== null) {
+                if (data.DomainPackageDetailsList != null) {
                     contents.DomainPackageDetailsList = deserializeAws_restJson1DomainPackageDetailsList(data.DomainPackageDetailsList, 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_restJson1ListPackagesForDomainCommandError = 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) {
@@ -3605,14 +3380,14 @@ var deserializeAws_restJson1ListPackagesForDomainCommandError = 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];
         }
     });
 }); };
@@ -3624,24 +3399,23 @@ export var deserializeAws_restJson1ListTagsCommand = function (output, context)
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListTagsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    TagList: 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.TagList !== undefined && data.TagList !== null) {
+                if (data.TagList != null) {
                     contents.TagList = deserializeAws_restJson1TagList(data.TagList, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListTagsCommandError = 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) {
@@ -3674,14 +3448,14 @@ var deserializeAws_restJson1ListTagsCommandError = 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];
         }
     });
 }); };
@@ -3693,28 +3467,26 @@ export var deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOffering
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ReservationName: undefined,
-                    ReservedElasticsearchInstanceId: 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.ReservationName !== undefined && data.ReservationName !== null) {
+                if (data.ReservationName != null) {
                     contents.ReservationName = __expectString(data.ReservationName);
                 }
-                if (data.ReservedElasticsearchInstanceId !== undefined && data.ReservedElasticsearchInstanceId !== null) {
+                if (data.ReservedElasticsearchInstanceId != null) {
                     contents.ReservedElasticsearchInstanceId = __expectString(data.ReservedElasticsearchInstanceId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommandError = 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) {
@@ -3755,14 +3527,14 @@ var deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommand
             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];
         }
     });
 }); };
@@ -3774,24 +3546,23 @@ export var deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionComm
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CrossClusterSearchConnection: 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.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
+                if (data.CrossClusterSearchConnection != null) {
                     contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommandError = 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) {
@@ -3816,14 +3587,14 @@ var deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommandErro
             case 5: throw _d.sent();
             case 6:
                 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 = 7;
+            case 7: return [2];
         }
     });
 }); };
@@ -3835,18 +3606,18 @@ export var deserializeAws_restJson1RemoveTagsCommand = function (output, context
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1RemoveTagsCommandError(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_restJson1RemoveTagsCommandError = 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) {
@@ -3875,14 +3646,14 @@ var deserializeAws_restJson1RemoveTagsCommandError = function (output, context)
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -3894,24 +3665,23 @@ export var deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateComman
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ServiceSoftwareOptions: 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.ServiceSoftwareOptions !== undefined && data.ServiceSoftwareOptions !== null) {
+                if (data.ServiceSoftwareOptions != null) {
                     contents.ServiceSoftwareOptions = deserializeAws_restJson1ServiceSoftwareOptions(data.ServiceSoftwareOptions, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandError = 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) {
@@ -3944,14 +3714,14 @@ var deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandError
             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];
         }
     });
 }); };
@@ -3963,28 +3733,26 @@ export var deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand = func
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    DomainConfig: undefined,
-                    DryRunResults: 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.DomainConfig !== undefined && data.DomainConfig !== null) {
+                if (data.DomainConfig != null) {
                     contents.DomainConfig = deserializeAws_restJson1ElasticsearchDomainConfig(data.DomainConfig, context);
                 }
-                if (data.DryRunResults !== undefined && data.DryRunResults !== null) {
+                if (data.DryRunResults != null) {
                     contents.DryRunResults = deserializeAws_restJson1DryRunResults(data.DryRunResults, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError = 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) {
@@ -4025,14 +3793,14 @@ var deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError = functi
             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];
         }
     });
 }); };
@@ -4044,24 +3812,23 @@ export var deserializeAws_restJson1UpdatePackageCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdatePackageCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    PackageDetails: 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.PackageDetails !== undefined && data.PackageDetails !== null) {
+                if (data.PackageDetails != null) {
                     contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdatePackageCommandError = 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) {
@@ -4102,14 +3869,14 @@ var deserializeAws_restJson1UpdatePackageCommandError = 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];
         }
     });
 }); };
@@ -4121,36 +3888,32 @@ export var deserializeAws_restJson1UpgradeElasticsearchDomainCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpgradeElasticsearchDomainCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ChangeProgressDetails: undefined,
-                    DomainName: undefined,
-                    PerformCheckOnly: undefined,
-                    TargetVersion: 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.ChangeProgressDetails !== undefined && data.ChangeProgressDetails !== null) {
+                if (data.ChangeProgressDetails != null) {
                     contents.ChangeProgressDetails = deserializeAws_restJson1ChangeProgressDetails(data.ChangeProgressDetails, context);
                 }
-                if (data.DomainName !== undefined && data.DomainName !== null) {
+                if (data.DomainName != null) {
                     contents.DomainName = __expectString(data.DomainName);
                 }
-                if (data.PerformCheckOnly !== undefined && data.PerformCheckOnly !== null) {
+                if (data.PerformCheckOnly != null) {
                     contents.PerformCheckOnly = __expectBoolean(data.PerformCheckOnly);
                 }
-                if (data.TargetVersion !== undefined && data.TargetVersion !== null) {
+                if (data.TargetVersion != null) {
                     contents.TargetVersion = __expectString(data.TargetVersion);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpgradeElasticsearchDomainCommandError = 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) {
@@ -4191,23 +3954,24 @@ var deserializeAws_restJson1UpgradeElasticsearchDomainCommandError = function (o
             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];
         }
     });
 }); };
+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));
@@ -4217,9 +3981,9 @@ var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutp
 var deserializeAws_restJson1BaseExceptionResponse = 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 BaseException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4229,9 +3993,9 @@ var deserializeAws_restJson1BaseExceptionResponse = function (parsedOutput, cont
 var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4241,9 +4005,9 @@ var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1DisabledOperationExceptionResponse = 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 DisabledOperationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4253,9 +4017,9 @@ var deserializeAws_restJson1DisabledOperationExceptionResponse = function (parse
 var deserializeAws_restJson1InternalExceptionResponse = 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 InternalException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4265,9 +4029,9 @@ var deserializeAws_restJson1InternalExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1InvalidPaginationTokenExceptionResponse = 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 InvalidPaginationTokenException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4277,9 +4041,9 @@ var deserializeAws_restJson1InvalidPaginationTokenExceptionResponse = function (
 var deserializeAws_restJson1InvalidTypeExceptionResponse = 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 InvalidTypeException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4289,9 +4053,9 @@ var deserializeAws_restJson1InvalidTypeExceptionResponse = function (parsedOutpu
 var deserializeAws_restJson1LimitExceededExceptionResponse = 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 LimitExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4301,9 +4065,9 @@ var deserializeAws_restJson1LimitExceededExceptionResponse = function (parsedOut
 var deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse = 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 ResourceAlreadyExistsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4313,9 +4077,9 @@ var deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse = function (p
 var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4325,9 +4089,9 @@ var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsed
 var deserializeAws_restJson1ValidationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4362,9 +4126,6 @@ var serializeAws_restJson1AutoTuneMaintenanceScheduleList = function (input, con
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AutoTuneMaintenanceSchedule(entry, context);
     });
 };
@@ -4391,9 +4152,6 @@ var serializeAws_restJson1DescribePackagesFilterList = function (input, context)
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1DescribePackagesFilter(entry, context);
     });
 };
@@ -4401,9 +4159,6 @@ var serializeAws_restJson1DescribePackagesFilterValues = function (input, contex
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4419,9 +4174,6 @@ var serializeAws_restJson1DomainNameList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4429,7 +4181,7 @@ var serializeAws_restJson1Duration = function (input, context) {
     return __assign(__assign({}, (input.Unit != null && { Unit: input.Unit })), (input.Value != null && { Value: input.Value }));
 };
 var serializeAws_restJson1EBSOptions = function (input, context) {
-    return __assign(__assign(__assign(__assign({}, (input.EBSEnabled != null && { EBSEnabled: input.EBSEnabled })), (input.Iops != null && { Iops: input.Iops })), (input.VolumeSize != null && { VolumeSize: input.VolumeSize })), (input.VolumeType != null && { VolumeType: input.VolumeType }));
+    return __assign(__assign(__assign(__assign(__assign({}, (input.EBSEnabled != null && { EBSEnabled: input.EBSEnabled })), (input.Iops != null && { Iops: input.Iops })), (input.Throughput != null && { Throughput: input.Throughput })), (input.VolumeSize != null && { VolumeSize: input.VolumeSize })), (input.VolumeType != null && { VolumeType: input.VolumeType }));
 };
 var serializeAws_restJson1ElasticsearchClusterConfig = function (input, context) {
     return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.ColdStorageOptions != null && {
@@ -4448,9 +4200,6 @@ var serializeAws_restJson1FilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1Filter(entry, context);
     });
 };
@@ -4489,9 +4238,6 @@ var serializeAws_restJson1StringList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4502,9 +4248,6 @@ var serializeAws_restJson1TagList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1Tag(entry, context);
     });
 };
@@ -4512,9 +4255,6 @@ var serializeAws_restJson1ValueStringList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4822,6 +4562,7 @@ var deserializeAws_restJson1EBSOptions = function (output, context) {
     return {
         EBSEnabled: __expectBoolean(output.EBSEnabled),
         Iops: __expectInt32(output.Iops),
+        Throughput: __expectInt32(output.Throughput),
         VolumeSize: __expectInt32(output.VolumeSize),
         VolumeType: __expectString(output.VolumeType),
     };