@aws-sdk/client-elasticsearch-service 3.139.0 → 3.145.0

package/dist-cjs/protocols/Aws_restJson1.js

@@ -11,16 +11,7 @@ const serializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand = a
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.CrossClusterSearchConnectionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: CrossClusterSearchConnectionId.");
-        }
-        resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "CrossClusterSearchConnectionId", () => input.CrossClusterSearchConnectionId, "{CrossClusterSearchConnectionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -60,26 +51,8 @@ const serializeAws_restJson1AssociatePackageCommand = async (input, context) =>
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.PackageID;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: PackageID.");
-        }
-        resolvedPath = resolvedPath.replace("{PackageID}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: PackageID.");
-    }
-    if (input.DomainName !== undefined) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "PackageID", () => input.PackageID, "{PackageID}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -227,16 +200,7 @@ const serializeAws_restJson1DeleteElasticsearchDomainCommand = async (input, con
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/es/domain/{DomainName}";
-    if (input.DomainName !== undefined) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -273,16 +237,7 @@ const serializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand = a
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.CrossClusterSearchConnectionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: CrossClusterSearchConnectionId.");
-        }
-        resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "CrossClusterSearchConnectionId", () => input.CrossClusterSearchConnectionId, "{CrossClusterSearchConnectionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -300,16 +255,7 @@ const serializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand =
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.CrossClusterSearchConnectionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: CrossClusterSearchConnectionId.");
-        }
-        resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "CrossClusterSearchConnectionId", () => input.CrossClusterSearchConnectionId, "{CrossClusterSearchConnectionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -326,16 +272,7 @@ const serializeAws_restJson1DeletePackageCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/packages/{PackageID}";
-    if (input.PackageID !== undefined) {
-        const labelValue = input.PackageID;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: PackageID.");
-        }
-        resolvedPath = resolvedPath.replace("{PackageID}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: PackageID.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "PackageID", () => input.PackageID, "{PackageID}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -355,16 +292,7 @@ const serializeAws_restJson1DescribeDomainAutoTunesCommand = async (input, conte
     };
     let resolvedPath = `${(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) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
     let body;
     body = JSON.stringify({
         ...(input.MaxResults != null && { MaxResults: input.MaxResults }),
@@ -386,19 +314,10 @@ const serializeAws_restJson1DescribeDomainChangeProgressCommand = async (input,
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
-    const query = {
-        ...(input.ChangeId !== undefined && { changeid: input.ChangeId }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
+    const query = map({
+        changeid: [, input.ChangeId],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -416,16 +335,7 @@ const serializeAws_restJson1DescribeElasticsearchDomainCommand = async (input, c
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/es/domain/{DomainName}";
-    if (input.DomainName !== undefined) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -442,16 +352,7 @@ const serializeAws_restJson1DescribeElasticsearchDomainConfigCommand = async (in
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -490,29 +391,11 @@ const serializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = asy
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.InstanceType;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: InstanceType.");
-        }
-        resolvedPath = resolvedPath.replace("{InstanceType}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: InstanceType.");
-    }
-    if (input.ElasticsearchVersion !== undefined) {
-        const labelValue = input.ElasticsearchVersion;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: ElasticsearchVersion.");
-        }
-        resolvedPath = resolvedPath.replace("{ElasticsearchVersion}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: ElasticsearchVersion.");
-    }
-    const query = {
-        ...(input.DomainName !== undefined && { domainName: input.DomainName }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "InstanceType", () => input.InstanceType, "{InstanceType}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ElasticsearchVersion", () => input.ElasticsearchVersion, "{ElasticsearchVersion}", false);
+    const query = map({
+        domainName: [, input.DomainName],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -601,13 +484,11 @@ const serializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsComman
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/es/reservedInstanceOfferings";
-    const query = {
-        ...(input.ReservedElasticsearchInstanceOfferingId !== undefined && {
-            offeringId: input.ReservedElasticsearchInstanceOfferingId,
-        }),
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    const query = map({
+        offeringId: [, input.ReservedElasticsearchInstanceOfferingId],
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -625,13 +506,11 @@ const serializeAws_restJson1DescribeReservedElasticsearchInstancesCommand = asyn
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/es/reservedInstances";
-    const query = {
-        ...(input.ReservedElasticsearchInstanceId !== undefined && {
-            reservationId: input.ReservedElasticsearchInstanceId,
-        }),
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    const query = map({
+        reservationId: [, input.ReservedElasticsearchInstanceId],
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -650,26 +529,8 @@ const serializeAws_restJson1DissociatePackageCommand = async (input, context) =>
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.PackageID;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: PackageID.");
-        }
-        resolvedPath = resolvedPath.replace("{PackageID}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: PackageID.");
-    }
-    if (input.DomainName !== undefined) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "PackageID", () => input.PackageID, "{PackageID}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -686,9 +547,9 @@ const serializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = async (i
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/es/compatibleVersions";
-    const query = {
-        ...(input.DomainName !== undefined && { domainName: input.DomainName }),
-    };
+    const query = map({
+        domainName: [, input.DomainName],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -706,20 +567,11 @@ const serializeAws_restJson1GetPackageVersionHistoryCommand = async (input, cont
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/packages/{PackageID}/history";
-    if (input.PackageID !== undefined) {
-        const labelValue = input.PackageID;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: PackageID.");
-        }
-        resolvedPath = resolvedPath.replace("{PackageID}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: PackageID.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "PackageID", () => input.PackageID, "{PackageID}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -738,20 +590,11 @@ const serializeAws_restJson1GetUpgradeHistoryCommand = async (input, context) =>
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -770,16 +613,7 @@ const serializeAws_restJson1GetUpgradeStatusCommand = async (input, context) =>
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -796,9 +630,9 @@ const serializeAws_restJson1ListDomainNamesCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/domain";
-    const query = {
-        ...(input.EngineType !== undefined && { engineType: input.EngineType }),
-    };
+    const query = map({
+        engineType: [, input.EngineType],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -816,20 +650,11 @@ const serializeAws_restJson1ListDomainsForPackageCommand = async (input, context
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/packages/{PackageID}/domains";
-    if (input.PackageID !== undefined) {
-        const labelValue = input.PackageID;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: PackageID.");
-        }
-        resolvedPath = resolvedPath.replace("{PackageID}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: PackageID.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "PackageID", () => input.PackageID, "{PackageID}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -848,21 +673,12 @@ const serializeAws_restJson1ListElasticsearchInstanceTypesCommand = async (input
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/2015-01-01/es/instanceTypes/{ElasticsearchVersion}";
-    if (input.ElasticsearchVersion !== undefined) {
-        const labelValue = input.ElasticsearchVersion;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: ElasticsearchVersion.");
-        }
-        resolvedPath = resolvedPath.replace("{ElasticsearchVersion}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: ElasticsearchVersion.");
-    }
-    const query = {
-        ...(input.DomainName !== undefined && { domainName: input.DomainName }),
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ElasticsearchVersion", () => input.ElasticsearchVersion, "{ElasticsearchVersion}", false);
+    const query = map({
+        domainName: [, input.DomainName],
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -880,10 +696,10 @@ const serializeAws_restJson1ListElasticsearchVersionsCommand = async (input, con
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/es/versions";
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -901,20 +717,11 @@ const serializeAws_restJson1ListPackagesForDomainCommand = async (input, context
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/domain/{DomainName}/packages";
-    if (input.DomainName !== undefined) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -932,9 +739,9 @@ const serializeAws_restJson1ListTagsCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/2015-01-01/tags";
-    const query = {
-        ...(input.ARN !== undefined && { arn: input.ARN }),
-    };
+    const query = map({
+        arn: [, input.ARN],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -979,16 +786,7 @@ const serializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand = a
     const headers = {};
     let resolvedPath = `${(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) {
-        const labelValue = input.CrossClusterSearchConnectionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: CrossClusterSearchConnectionId.");
-        }
-        resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "CrossClusterSearchConnectionId", () => input.CrossClusterSearchConnectionId, "{CrossClusterSearchConnectionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -1051,16 +849,7 @@ const serializeAws_restJson1UpdateElasticsearchDomainConfigCommand = async (inpu
         "content-type": "application/json",
     };
     let resolvedPath = `${(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) {
-        const labelValue = input.DomainName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DomainName.");
-        }
-        resolvedPath = resolvedPath.replace("{DomainName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DomainName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DomainName", () => input.DomainName, "{DomainName}", false);
     let body;
     body = JSON.stringify({
         ...(input.AccessPolicies != null && { AccessPolicies: input.AccessPolicies }),
@@ -1162,15 +951,14 @@ const deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand =
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        CrossClusterSearchConnection: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
+    if (data.CrossClusterSearchConnection != null) {
         contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand = deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand;
 const deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommandError = async (output, context) => {
@@ -1178,7 +966,6 @@ const deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommandEr
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -1192,25 +979,23 @@ const deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommandEr
             throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1AddTagsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1AddTagsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1AddTagsCommand = deserializeAws_restJson1AddTagsCommand;
 const deserializeAws_restJson1AddTagsCommandError = async (output, context) => {
@@ -1218,7 +1003,6 @@ const deserializeAws_restJson1AddTagsCommandError = async (output, context) => {
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1235,29 +1019,26 @@ const deserializeAws_restJson1AddTagsCommandError = async (output, context) => {
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1AssociatePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1AssociatePackageCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainPackageDetails: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DomainPackageDetails !== undefined && data.DomainPackageDetails !== null) {
+    if (data.DomainPackageDetails != null) {
         contents.DomainPackageDetails = deserializeAws_restJson1DomainPackageDetails(data.DomainPackageDetails, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1AssociatePackageCommand = deserializeAws_restJson1AssociatePackageCommand;
 const deserializeAws_restJson1AssociatePackageCommandError = async (output, context) => {
@@ -1265,7 +1046,6 @@ const deserializeAws_restJson1AssociatePackageCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1288,29 +1068,26 @@ const deserializeAws_restJson1AssociatePackageCommandError = async (output, cont
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ServiceSoftwareOptions: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ServiceSoftwareOptions !== undefined && data.ServiceSoftwareOptions !== null) {
+    if (data.ServiceSoftwareOptions != null) {
         contents.ServiceSoftwareOptions = deserializeAws_restJson1ServiceSoftwareOptions(data.ServiceSoftwareOptions, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommand = deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommand;
 const deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandError = async (output, context) => {
@@ -1318,7 +1095,6 @@ const deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandErr
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1335,29 +1111,26 @@ const deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandErr
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateElasticsearchDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateElasticsearchDomainCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainStatus: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DomainStatus !== undefined && data.DomainStatus !== null) {
+    if (data.DomainStatus != null) {
         contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateElasticsearchDomainCommand = deserializeAws_restJson1CreateElasticsearchDomainCommand;
 const deserializeAws_restJson1CreateElasticsearchDomainCommandError = async (output, context) => {
@@ -1365,7 +1138,6 @@ const deserializeAws_restJson1CreateElasticsearchDomainCommandError = async (out
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1391,45 +1163,38 @@ const deserializeAws_restJson1CreateElasticsearchDomainCommandError = async (out
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ConnectionAlias: undefined,
-        ConnectionStatus: undefined,
-        CrossClusterSearchConnectionId: undefined,
-        DestinationDomainInfo: undefined,
-        SourceDomainInfo: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ConnectionAlias !== undefined && data.ConnectionAlias !== null) {
+    if (data.ConnectionAlias != null) {
         contents.ConnectionAlias = (0, smithy_client_1.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 = (0, smithy_client_1.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 Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommand = deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommand;
 const deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandError = async (output, context) => {
@@ -1437,7 +1202,6 @@ const deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandE
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -1454,29 +1218,26 @@ const deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandE
             throw await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreatePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreatePackageCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        PackageDetails: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.PackageDetails !== undefined && data.PackageDetails !== null) {
+    if (data.PackageDetails != null) {
         contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreatePackageCommand = deserializeAws_restJson1CreatePackageCommand;
 const deserializeAws_restJson1CreatePackageCommandError = async (output, context) => {
@@ -1484,7 +1245,6 @@ const deserializeAws_restJson1CreatePackageCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1510,29 +1270,26 @@ const deserializeAws_restJson1CreatePackageCommandError = async (output, context
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteElasticsearchDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteElasticsearchDomainCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainStatus: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DomainStatus !== undefined && data.DomainStatus !== null) {
+    if (data.DomainStatus != null) {
         contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteElasticsearchDomainCommand = deserializeAws_restJson1DeleteElasticsearchDomainCommand;
 const deserializeAws_restJson1DeleteElasticsearchDomainCommandError = async (output, context) => {
@@ -1540,7 +1297,6 @@ const deserializeAws_restJson1DeleteElasticsearchDomainCommandError = async (out
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1557,25 +1313,23 @@ const deserializeAws_restJson1DeleteElasticsearchDomainCommandError = async (out
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteElasticsearchServiceRoleCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteElasticsearchServiceRoleCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteElasticsearchServiceRoleCommand = deserializeAws_restJson1DeleteElasticsearchServiceRoleCommand;
 const deserializeAws_restJson1DeleteElasticsearchServiceRoleCommandError = async (output, context) => {
@@ -1583,7 +1337,6 @@ const deserializeAws_restJson1DeleteElasticsearchServiceRoleCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1597,29 +1350,26 @@ const deserializeAws_restJson1DeleteElasticsearchServiceRoleCommandError = async
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        CrossClusterSearchConnection: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
+    if (data.CrossClusterSearchConnection != null) {
         contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand = deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand;
 const deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandError = async (output, context) => {
@@ -1627,7 +1377,6 @@ const deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandEr
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -1638,29 +1387,26 @@ const deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandEr
             throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        CrossClusterSearchConnection: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
+    if (data.CrossClusterSearchConnection != null) {
         contents.CrossClusterSearchConnection = deserializeAws_restJson1OutboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand = deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand;
 const deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandError = async (output, context) => {
@@ -1668,7 +1414,6 @@ const deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandE
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -1679,29 +1424,26 @@ const deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandE
             throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeletePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeletePackageCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        PackageDetails: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.PackageDetails !== undefined && data.PackageDetails !== null) {
+    if (data.PackageDetails != null) {
         contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeletePackageCommand = deserializeAws_restJson1DeletePackageCommand;
 const deserializeAws_restJson1DeletePackageCommandError = async (output, context) => {
@@ -1709,7 +1451,6 @@ const deserializeAws_restJson1DeletePackageCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1732,33 +1473,29 @@ const deserializeAws_restJson1DeletePackageCommandError = async (output, context
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeDomainAutoTunesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeDomainAutoTunesCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        AutoTunes: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeDomainAutoTunesCommand = deserializeAws_restJson1DescribeDomainAutoTunesCommand;
 const deserializeAws_restJson1DescribeDomainAutoTunesCommandError = async (output, context) => {
@@ -1766,7 +1503,6 @@ const deserializeAws_restJson1DescribeDomainAutoTunesCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1783,29 +1519,26 @@ const deserializeAws_restJson1DescribeDomainAutoTunesCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeDomainChangeProgressCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeDomainChangeProgressCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ChangeProgressStatus: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ChangeProgressStatus !== undefined && data.ChangeProgressStatus !== null) {
+    if (data.ChangeProgressStatus != null) {
         contents.ChangeProgressStatus = deserializeAws_restJson1ChangeProgressStatusDetails(data.ChangeProgressStatus, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeDomainChangeProgressCommand = deserializeAws_restJson1DescribeDomainChangeProgressCommand;
 const deserializeAws_restJson1DescribeDomainChangeProgressCommandError = async (output, context) => {
@@ -1813,7 +1546,6 @@ const deserializeAws_restJson1DescribeDomainChangeProgressCommandError = async (
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1830,29 +1562,26 @@ const deserializeAws_restJson1DescribeDomainChangeProgressCommandError = async (
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeElasticsearchDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeElasticsearchDomainCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainStatus: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DomainStatus !== undefined && data.DomainStatus !== null) {
+    if (data.DomainStatus != null) {
         contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeElasticsearchDomainCommand = deserializeAws_restJson1DescribeElasticsearchDomainCommand;
 const deserializeAws_restJson1DescribeElasticsearchDomainCommandError = async (output, context) => {
@@ -1860,7 +1589,6 @@ const deserializeAws_restJson1DescribeElasticsearchDomainCommandError = async (o
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1877,29 +1605,26 @@ const deserializeAws_restJson1DescribeElasticsearchDomainCommandError = async (o
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainConfig: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DomainConfig !== undefined && data.DomainConfig !== null) {
+    if (data.DomainConfig != null) {
         contents.DomainConfig = deserializeAws_restJson1ElasticsearchDomainConfig(data.DomainConfig, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand = deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand;
 const deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError = async (output, context) => {
@@ -1907,7 +1632,6 @@ const deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError = as
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1924,29 +1648,26 @@ const deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError = as
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeElasticsearchDomainsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeElasticsearchDomainsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainStatusList: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DomainStatusList !== undefined && data.DomainStatusList !== null) {
+    if (data.DomainStatusList != null) {
         contents.DomainStatusList = deserializeAws_restJson1ElasticsearchDomainStatusList(data.DomainStatusList, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeElasticsearchDomainsCommand = deserializeAws_restJson1DescribeElasticsearchDomainsCommand;
 const deserializeAws_restJson1DescribeElasticsearchDomainsCommandError = async (output, context) => {
@@ -1954,7 +1675,6 @@ const deserializeAws_restJson1DescribeElasticsearchDomainsCommandError = async (
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -1968,29 +1688,26 @@ const deserializeAws_restJson1DescribeElasticsearchDomainsCommandError = async (
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        LimitsByRole: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.LimitsByRole !== undefined && data.LimitsByRole !== null) {
+    if (data.LimitsByRole != null) {
         contents.LimitsByRole = deserializeAws_restJson1LimitsByRole(data.LimitsByRole, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand;
 const deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandError = async (output, context) => {
@@ -1998,7 +1715,6 @@ const deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandErro
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2021,33 +1737,29 @@ const deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandErro
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        CrossClusterSearchConnections: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommand = deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommand;
 const deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommandError = async (output, context) => {
@@ -2055,7 +1767,6 @@ const deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsComman
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -2066,33 +1777,29 @@ const deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsComman
             throw await deserializeAws_restJson1InvalidPaginationTokenExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        CrossClusterSearchConnections: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommand = deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommand;
 const deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommandError = async (output, context) => {
@@ -2100,7 +1807,6 @@ const deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsComma
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -2111,33 +1817,29 @@ const deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsComma
             throw await deserializeAws_restJson1InvalidPaginationTokenExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribePackagesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribePackagesCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        NextToken: undefined,
-        PackageDetailsList: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    if (data.PackageDetailsList !== undefined && data.PackageDetailsList !== null) {
+    if (data.PackageDetailsList != null) {
         contents.PackageDetailsList = deserializeAws_restJson1PackageDetailsList(data.PackageDetailsList, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribePackagesCommand = deserializeAws_restJson1DescribePackagesCommand;
 const deserializeAws_restJson1DescribePackagesCommandError = async (output, context) => {
@@ -2145,7 +1847,6 @@ const deserializeAws_restJson1DescribePackagesCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2165,34 +1866,29 @@ const deserializeAws_restJson1DescribePackagesCommandError = async (output, cont
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        NextToken: undefined,
-        ReservedElasticsearchInstanceOfferings: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    if (data.ReservedElasticsearchInstanceOfferings !== undefined &&
-        data.ReservedElasticsearchInstanceOfferings !== null) {
+    if (data.ReservedElasticsearchInstanceOfferings != null) {
         contents.ReservedElasticsearchInstanceOfferings = deserializeAws_restJson1ReservedElasticsearchInstanceOfferingList(data.ReservedElasticsearchInstanceOfferings, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommand = deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommand;
 const deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommandError = async (output, context) => {
@@ -2200,7 +1896,6 @@ const deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsComm
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -2217,33 +1912,29 @@ const deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsComm
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        NextToken: undefined,
-        ReservedElasticsearchInstances: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    if (data.ReservedElasticsearchInstances !== undefined && data.ReservedElasticsearchInstances !== null) {
+    if (data.ReservedElasticsearchInstances != null) {
         contents.ReservedElasticsearchInstances = deserializeAws_restJson1ReservedElasticsearchInstanceList(data.ReservedElasticsearchInstances, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand = deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand;
 const deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError = async (output, context) => {
@@ -2251,7 +1942,6 @@ const deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -2268,29 +1958,26 @@ const deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DissociatePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DissociatePackageCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainPackageDetails: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DomainPackageDetails !== undefined && data.DomainPackageDetails !== null) {
+    if (data.DomainPackageDetails != null) {
         contents.DomainPackageDetails = deserializeAws_restJson1DomainPackageDetails(data.DomainPackageDetails, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DissociatePackageCommand = deserializeAws_restJson1DissociatePackageCommand;
 const deserializeAws_restJson1DissociatePackageCommandError = async (output, context) => {
@@ -2298,7 +1985,6 @@ const deserializeAws_restJson1DissociatePackageCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2321,29 +2007,26 @@ const deserializeAws_restJson1DissociatePackageCommandError = async (output, con
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        CompatibleElasticsearchVersions: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.CompatibleElasticsearchVersions !== undefined && data.CompatibleElasticsearchVersions !== null) {
+    if (data.CompatibleElasticsearchVersions != null) {
         contents.CompatibleElasticsearchVersions = deserializeAws_restJson1CompatibleElasticsearchVersionsList(data.CompatibleElasticsearchVersions, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand;
 const deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError = async (output, context) => {
@@ -2351,7 +2034,6 @@ const deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError = a
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2371,37 +2053,32 @@ const deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError = a
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetPackageVersionHistoryCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetPackageVersionHistoryCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        NextToken: undefined,
-        PackageID: undefined,
-        PackageVersionHistoryList: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    if (data.PackageID !== undefined && data.PackageID !== null) {
+    if (data.PackageID != null) {
         contents.PackageID = (0, smithy_client_1.expectString)(data.PackageID);
     }
-    if (data.PackageVersionHistoryList !== undefined && data.PackageVersionHistoryList !== null) {
+    if (data.PackageVersionHistoryList != null) {
         contents.PackageVersionHistoryList = deserializeAws_restJson1PackageVersionHistoryList(data.PackageVersionHistoryList, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetPackageVersionHistoryCommand = deserializeAws_restJson1GetPackageVersionHistoryCommand;
 const deserializeAws_restJson1GetPackageVersionHistoryCommandError = async (output, context) => {
@@ -2409,7 +2086,6 @@ const deserializeAws_restJson1GetPackageVersionHistoryCommandError = async (outp
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2429,33 +2105,29 @@ const deserializeAws_restJson1GetPackageVersionHistoryCommandError = async (outp
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetUpgradeHistoryCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetUpgradeHistoryCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        NextToken: undefined,
-        UpgradeHistories: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    if (data.UpgradeHistories !== undefined && data.UpgradeHistories !== null) {
+    if (data.UpgradeHistories != null) {
         contents.UpgradeHistories = deserializeAws_restJson1UpgradeHistoryList(data.UpgradeHistories, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetUpgradeHistoryCommand = deserializeAws_restJson1GetUpgradeHistoryCommand;
 const deserializeAws_restJson1GetUpgradeHistoryCommandError = async (output, context) => {
@@ -2463,7 +2135,6 @@ const deserializeAws_restJson1GetUpgradeHistoryCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2483,37 +2154,32 @@ const deserializeAws_restJson1GetUpgradeHistoryCommandError = async (output, con
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetUpgradeStatusCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetUpgradeStatusCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        StepStatus: undefined,
-        UpgradeName: undefined,
-        UpgradeStep: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.StepStatus !== undefined && data.StepStatus !== null) {
+    if (data.StepStatus != null) {
         contents.StepStatus = (0, smithy_client_1.expectString)(data.StepStatus);
     }
-    if (data.UpgradeName !== undefined && data.UpgradeName !== null) {
+    if (data.UpgradeName != null) {
         contents.UpgradeName = (0, smithy_client_1.expectString)(data.UpgradeName);
     }
-    if (data.UpgradeStep !== undefined && data.UpgradeStep !== null) {
+    if (data.UpgradeStep != null) {
         contents.UpgradeStep = (0, smithy_client_1.expectString)(data.UpgradeStep);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetUpgradeStatusCommand = deserializeAws_restJson1GetUpgradeStatusCommand;
 const deserializeAws_restJson1GetUpgradeStatusCommandError = async (output, context) => {
@@ -2521,7 +2187,6 @@ const deserializeAws_restJson1GetUpgradeStatusCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2541,29 +2206,26 @@ const deserializeAws_restJson1GetUpgradeStatusCommandError = async (output, cont
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListDomainNamesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListDomainNamesCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainNames: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DomainNames !== undefined && data.DomainNames !== null) {
+    if (data.DomainNames != null) {
         contents.DomainNames = deserializeAws_restJson1DomainInfoList(data.DomainNames, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListDomainNamesCommand = deserializeAws_restJson1ListDomainNamesCommand;
 const deserializeAws_restJson1ListDomainNamesCommandError = async (output, context) => {
@@ -2571,7 +2233,6 @@ const deserializeAws_restJson1ListDomainNamesCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2582,33 +2243,29 @@ const deserializeAws_restJson1ListDomainNamesCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListDomainsForPackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListDomainsForPackageCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainPackageDetailsList: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListDomainsForPackageCommand = deserializeAws_restJson1ListDomainsForPackageCommand;
 const deserializeAws_restJson1ListDomainsForPackageCommandError = async (output, context) => {
@@ -2616,7 +2273,6 @@ const deserializeAws_restJson1ListDomainsForPackageCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2636,33 +2292,29 @@ const deserializeAws_restJson1ListDomainsForPackageCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListElasticsearchInstanceTypesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListElasticsearchInstanceTypesCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ElasticsearchInstanceTypes: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListElasticsearchInstanceTypesCommand = deserializeAws_restJson1ListElasticsearchInstanceTypesCommand;
 const deserializeAws_restJson1ListElasticsearchInstanceTypesCommandError = async (output, context) => {
@@ -2670,7 +2322,6 @@ const deserializeAws_restJson1ListElasticsearchInstanceTypesCommandError = async
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2687,33 +2338,29 @@ const deserializeAws_restJson1ListElasticsearchInstanceTypesCommandError = async
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListElasticsearchVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListElasticsearchVersionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ElasticsearchVersions: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListElasticsearchVersionsCommand = deserializeAws_restJson1ListElasticsearchVersionsCommand;
 const deserializeAws_restJson1ListElasticsearchVersionsCommandError = async (output, context) => {
@@ -2721,7 +2368,6 @@ const deserializeAws_restJson1ListElasticsearchVersionsCommandError = async (out
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2738,33 +2384,29 @@ const deserializeAws_restJson1ListElasticsearchVersionsCommandError = async (out
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListPackagesForDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListPackagesForDomainCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainPackageDetailsList: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListPackagesForDomainCommand = deserializeAws_restJson1ListPackagesForDomainCommand;
 const deserializeAws_restJson1ListPackagesForDomainCommandError = async (output, context) => {
@@ -2772,7 +2414,6 @@ const deserializeAws_restJson1ListPackagesForDomainCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2792,29 +2433,26 @@ const deserializeAws_restJson1ListPackagesForDomainCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListTagsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListTagsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        TagList: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.TagList !== undefined && data.TagList !== null) {
+    if (data.TagList != null) {
         contents.TagList = deserializeAws_restJson1TagList(data.TagList, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListTagsCommand = deserializeAws_restJson1ListTagsCommand;
 const deserializeAws_restJson1ListTagsCommandError = async (output, context) => {
@@ -2822,7 +2460,6 @@ const deserializeAws_restJson1ListTagsCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2839,33 +2476,29 @@ const deserializeAws_restJson1ListTagsCommandError = async (output, context) =>
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ReservationName: undefined,
-        ReservedElasticsearchInstanceId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ReservationName !== undefined && data.ReservationName !== null) {
+    if (data.ReservationName != null) {
         contents.ReservationName = (0, smithy_client_1.expectString)(data.ReservationName);
     }
-    if (data.ReservedElasticsearchInstanceId !== undefined && data.ReservedElasticsearchInstanceId !== null) {
+    if (data.ReservedElasticsearchInstanceId != null) {
         contents.ReservedElasticsearchInstanceId = (0, smithy_client_1.expectString)(data.ReservedElasticsearchInstanceId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommand = deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommand;
 const deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommandError = async (output, context) => {
@@ -2873,7 +2506,6 @@ const deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingComma
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -2896,29 +2528,26 @@ const deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingComma
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        CrossClusterSearchConnection: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
+    if (data.CrossClusterSearchConnection != null) {
         contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand = deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand;
 const deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommandError = async (output, context) => {
@@ -2926,7 +2555,6 @@ const deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommandEr
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DisabledOperationException":
@@ -2937,25 +2565,23 @@ const deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommandEr
             throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1RemoveTagsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1RemoveTagsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1RemoveTagsCommand = deserializeAws_restJson1RemoveTagsCommand;
 const deserializeAws_restJson1RemoveTagsCommandError = async (output, context) => {
@@ -2963,7 +2589,6 @@ const deserializeAws_restJson1RemoveTagsCommandError = async (output, context) =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -2977,29 +2602,26 @@ const deserializeAws_restJson1RemoveTagsCommandError = async (output, context) =
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ServiceSoftwareOptions: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.ServiceSoftwareOptions !== undefined && data.ServiceSoftwareOptions !== null) {
+    if (data.ServiceSoftwareOptions != null) {
         contents.ServiceSoftwareOptions = deserializeAws_restJson1ServiceSoftwareOptions(data.ServiceSoftwareOptions, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommand = deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommand;
 const deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandError = async (output, context) => {
@@ -3007,7 +2629,6 @@ const deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandErro
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -3024,33 +2645,29 @@ const deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandErro
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DomainConfig: undefined,
-        DryRunResults: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand = deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand;
 const deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError = async (output, context) => {
@@ -3058,7 +2675,6 @@ const deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError = asyn
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -3081,29 +2697,26 @@ const deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError = asyn
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdatePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdatePackageCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        PackageDetails: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.PackageDetails !== undefined && data.PackageDetails !== null) {
+    if (data.PackageDetails != null) {
         contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdatePackageCommand = deserializeAws_restJson1UpdatePackageCommand;
 const deserializeAws_restJson1UpdatePackageCommandError = async (output, context) => {
@@ -3111,7 +2724,6 @@ const deserializeAws_restJson1UpdatePackageCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -3134,41 +2746,35 @@ const deserializeAws_restJson1UpdatePackageCommandError = async (output, context
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpgradeElasticsearchDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpgradeElasticsearchDomainCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        ChangeProgressDetails: undefined,
-        DomainName: undefined,
-        PerformCheckOnly: undefined,
-        TargetVersion: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "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 = (0, smithy_client_1.expectString)(data.DomainName);
     }
-    if (data.PerformCheckOnly !== undefined && data.PerformCheckOnly !== null) {
+    if (data.PerformCheckOnly != null) {
         contents.PerformCheckOnly = (0, smithy_client_1.expectBoolean)(data.PerformCheckOnly);
     }
-    if (data.TargetVersion !== undefined && data.TargetVersion !== null) {
+    if (data.TargetVersion != null) {
         contents.TargetVersion = (0, smithy_client_1.expectString)(data.TargetVersion);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpgradeElasticsearchDomainCommand = deserializeAws_restJson1UpgradeElasticsearchDomainCommand;
 const deserializeAws_restJson1UpgradeElasticsearchDomainCommandError = async (output, context) => {
@@ -3176,7 +2782,6 @@ const deserializeAws_restJson1UpgradeElasticsearchDomainCommandError = async (ou
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BaseException":
@@ -3199,20 +2804,19 @@ const deserializeAws_restJson1UpgradeElasticsearchDomainCommandError = async (ou
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
+const map = smithy_client_1.map;
 const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.AccessDeniedException({
@@ -3222,9 +2826,9 @@ const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutpu
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1BaseExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.BaseException({
@@ -3234,9 +2838,9 @@ const deserializeAws_restJson1BaseExceptionResponse = async (parsedOutput, conte
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ConflictException({
@@ -3246,9 +2850,9 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1DisabledOperationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.DisabledOperationException({
@@ -3258,9 +2862,9 @@ const deserializeAws_restJson1DisabledOperationExceptionResponse = async (parsed
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.InternalException({
@@ -3270,9 +2874,9 @@ const deserializeAws_restJson1InternalExceptionResponse = async (parsedOutput, c
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InvalidPaginationTokenExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.InvalidPaginationTokenException({
@@ -3282,9 +2886,9 @@ const deserializeAws_restJson1InvalidPaginationTokenExceptionResponse = async (p
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InvalidTypeExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.InvalidTypeException({
@@ -3294,9 +2898,9 @@ const deserializeAws_restJson1InvalidTypeExceptionResponse = async (parsedOutput
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1LimitExceededExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.LimitExceededException({
@@ -3306,9 +2910,9 @@ const deserializeAws_restJson1LimitExceededExceptionResponse = async (parsedOutp
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ResourceAlreadyExistsException({
@@ -3318,9 +2922,9 @@ const deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse = async (pa
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ResourceNotFoundException({
@@ -3330,9 +2934,9 @@ const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedO
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
     const exception = new models_0_1.ValidationException({
@@ -3380,9 +2984,6 @@ const serializeAws_restJson1AutoTuneMaintenanceScheduleList = (input, context) =
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AutoTuneMaintenanceSchedule(entry, context);
     });
 };
@@ -3426,9 +3027,6 @@ const serializeAws_restJson1DescribePackagesFilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1DescribePackagesFilter(entry, context);
     });
 };
@@ -3436,9 +3034,6 @@ const serializeAws_restJson1DescribePackagesFilterValues = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3464,9 +3059,6 @@ const serializeAws_restJson1DomainNameList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3520,9 +3112,6 @@ const serializeAws_restJson1FilterList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1Filter(entry, context);
     });
 };
@@ -3587,9 +3176,6 @@ const serializeAws_restJson1StringList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3603,9 +3189,6 @@ const serializeAws_restJson1TagList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1Tag(entry, context);
     });
 };
@@ -3613,9 +3196,6 @@ const serializeAws_restJson1ValueStringList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };