@aws-sdk/client-elasticsearch-service 3.29.0 → 3.33.0

package/dist/cjs/protocols/Aws_restJson1.js

@@ -14,7 +14,7 @@ const serializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand = a
         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));
+        resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
@@ -64,7 +64,7 @@ const serializeAws_restJson1AssociatePackageCommand = async (input, context) =>
         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));
+        resolvedPath = resolvedPath.replace("{PackageID}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: PackageID.");
@@ -74,7 +74,7 @@ const serializeAws_restJson1AssociatePackageCommand = async (input, context) =>
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -251,7 +251,7 @@ const serializeAws_restJson1DeleteElasticsearchDomainCommand = async (input, con
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -297,7 +297,7 @@ const serializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand = a
         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));
+        resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
@@ -324,7 +324,7 @@ const serializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand =
         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));
+        resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
@@ -350,7 +350,7 @@ const serializeAws_restJson1DeletePackageCommand = async (input, context) => {
         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));
+        resolvedPath = resolvedPath.replace("{PackageID}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: PackageID.");
@@ -379,7 +379,7 @@ const serializeAws_restJson1DescribeDomainAutoTunesCommand = async (input, conte
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -409,7 +409,7 @@ const serializeAws_restJson1DescribeElasticsearchDomainCommand = async (input, c
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -435,7 +435,7 @@ const serializeAws_restJson1DescribeElasticsearchDomainConfigCommand = async (in
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -484,7 +484,7 @@ const serializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = asy
         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));
+        resolvedPath = resolvedPath.replace("{InstanceType}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: InstanceType.");
@@ -494,7 +494,7 @@ const serializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = asy
         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));
+        resolvedPath = resolvedPath.replace("{ElasticsearchVersion}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: ElasticsearchVersion.");
@@ -647,7 +647,7 @@ const serializeAws_restJson1DissociatePackageCommand = async (input, context) =>
         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));
+        resolvedPath = resolvedPath.replace("{PackageID}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: PackageID.");
@@ -657,7 +657,7 @@ const serializeAws_restJson1DissociatePackageCommand = async (input, context) =>
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -703,7 +703,7 @@ const serializeAws_restJson1GetPackageVersionHistoryCommand = async (input, cont
         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));
+        resolvedPath = resolvedPath.replace("{PackageID}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: PackageID.");
@@ -735,7 +735,7 @@ const serializeAws_restJson1GetUpgradeHistoryCommand = async (input, context) =>
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -767,7 +767,7 @@ const serializeAws_restJson1GetUpgradeStatusCommand = async (input, context) =>
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -786,12 +786,12 @@ const serializeAws_restJson1GetUpgradeStatusCommand = async (input, context) =>
 exports.serializeAws_restJson1GetUpgradeStatusCommand = serializeAws_restJson1GetUpgradeStatusCommand;
 const serializeAws_restJson1ListDomainNamesCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
-    const headers = {
-        "content-type": "application/json",
-    };
+    const headers = {};
     let 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 }),
+    };
     let body;
-    body = "";
     return new protocol_http_1.HttpRequest({
         protocol,
         hostname,
@@ -799,6 +799,7 @@ const serializeAws_restJson1ListDomainNamesCommand = async (input, context) => {
         method: "GET",
         headers,
         path: resolvedPath,
+        query,
         body,
     });
 };
@@ -812,7 +813,7 @@ const serializeAws_restJson1ListDomainsForPackageCommand = async (input, context
         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));
+        resolvedPath = resolvedPath.replace("{PackageID}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: PackageID.");
@@ -844,7 +845,7 @@ const serializeAws_restJson1ListElasticsearchInstanceTypesCommand = async (input
         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));
+        resolvedPath = resolvedPath.replace("{ElasticsearchVersion}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: ElasticsearchVersion.");
@@ -897,7 +898,7 @@ const serializeAws_restJson1ListPackagesForDomainCommand = async (input, context
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -977,7 +978,7 @@ const serializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand = a
         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));
+        resolvedPath = resolvedPath.replace("{CrossClusterSearchConnectionId}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: CrossClusterSearchConnectionId.");
@@ -1050,7 +1051,7 @@ const serializeAws_restJson1UpdateElasticsearchDomainConfigCommand = async (inpu
         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));
+        resolvedPath = resolvedPath.replace("{DomainName}", smithy_client_1.extendedEncodeURIComponent(labelValue));
     }
     else {
         throw new Error("No value provided for input HTTP label: DomainName.");
@@ -1175,7 +1176,7 @@ const deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand =
         $metadata: deserializeMetadata(output),
         CrossClusterSearchConnection: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
         contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
     }
@@ -1307,7 +1308,7 @@ const deserializeAws_restJson1AssociatePackageCommand = async (output, context)
         $metadata: deserializeMetadata(output),
         DomainPackageDetails: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainPackageDetails !== undefined && data.DomainPackageDetails !== null) {
         contents.DomainPackageDetails = deserializeAws_restJson1DomainPackageDetails(data.DomainPackageDetails, context);
     }
@@ -1395,7 +1396,7 @@ const deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommand =
         $metadata: deserializeMetadata(output),
         ServiceSoftwareOptions: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ServiceSoftwareOptions !== undefined && data.ServiceSoftwareOptions !== null) {
         contents.ServiceSoftwareOptions = deserializeAws_restJson1ServiceSoftwareOptions(data.ServiceSoftwareOptions, context);
     }
@@ -1467,7 +1468,7 @@ const deserializeAws_restJson1CreateElasticsearchDomainCommand = async (output,
         $metadata: deserializeMetadata(output),
         DomainStatus: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainStatus !== undefined && data.DomainStatus !== null) {
         contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
     }
@@ -1567,15 +1568,15 @@ const deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommand
         DestinationDomainInfo: undefined,
         SourceDomainInfo: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ConnectionAlias !== undefined && data.ConnectionAlias !== null) {
-        contents.ConnectionAlias = (0, smithy_client_1.expectString)(data.ConnectionAlias);
+        contents.ConnectionAlias = smithy_client_1.expectString(data.ConnectionAlias);
     }
     if (data.ConnectionStatus !== undefined && data.ConnectionStatus !== null) {
         contents.ConnectionStatus = deserializeAws_restJson1OutboundCrossClusterSearchConnectionStatus(data.ConnectionStatus, context);
     }
     if (data.CrossClusterSearchConnectionId !== undefined && data.CrossClusterSearchConnectionId !== null) {
-        contents.CrossClusterSearchConnectionId = (0, smithy_client_1.expectString)(data.CrossClusterSearchConnectionId);
+        contents.CrossClusterSearchConnectionId = smithy_client_1.expectString(data.CrossClusterSearchConnectionId);
     }
     if (data.DestinationDomainInfo !== undefined && data.DestinationDomainInfo !== null) {
         contents.DestinationDomainInfo = deserializeAws_restJson1DomainInformation(data.DestinationDomainInfo, context);
@@ -1651,7 +1652,7 @@ const deserializeAws_restJson1CreatePackageCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
         PackageDetails: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.PackageDetails !== undefined && data.PackageDetails !== null) {
         contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
     }
@@ -1747,7 +1748,7 @@ const deserializeAws_restJson1DeleteElasticsearchDomainCommand = async (output,
         $metadata: deserializeMetadata(output),
         DomainStatus: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainStatus !== undefined && data.DomainStatus !== null) {
         contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
     }
@@ -1879,7 +1880,7 @@ const deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand =
         $metadata: deserializeMetadata(output),
         CrossClusterSearchConnection: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
         contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
     }
@@ -1935,7 +1936,7 @@ const deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand
         $metadata: deserializeMetadata(output),
         CrossClusterSearchConnection: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
         contents.CrossClusterSearchConnection = deserializeAws_restJson1OutboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
     }
@@ -1991,7 +1992,7 @@ const deserializeAws_restJson1DeletePackageCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
         PackageDetails: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.PackageDetails !== undefined && data.PackageDetails !== null) {
         contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
     }
@@ -2080,12 +2081,12 @@ const deserializeAws_restJson1DescribeDomainAutoTunesCommand = async (output, co
         AutoTunes: undefined,
         NextToken: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.AutoTunes !== undefined && data.AutoTunes !== null) {
         contents.AutoTunes = deserializeAws_restJson1AutoTuneList(data.AutoTunes, context);
     }
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     return Promise.resolve(contents);
 };
@@ -2155,7 +2156,7 @@ const deserializeAws_restJson1DescribeElasticsearchDomainCommand = async (output
         $metadata: deserializeMetadata(output),
         DomainStatus: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainStatus !== undefined && data.DomainStatus !== null) {
         contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
     }
@@ -2227,7 +2228,7 @@ const deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand = async (
         $metadata: deserializeMetadata(output),
         DomainConfig: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainConfig !== undefined && data.DomainConfig !== null) {
         contents.DomainConfig = deserializeAws_restJson1ElasticsearchDomainConfig(data.DomainConfig, context);
     }
@@ -2299,7 +2300,7 @@ const deserializeAws_restJson1DescribeElasticsearchDomainsCommand = async (outpu
         $metadata: deserializeMetadata(output),
         DomainStatusList: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainStatusList !== undefined && data.DomainStatusList !== null) {
         contents.DomainStatusList = deserializeAws_restJson1ElasticsearchDomainStatusList(data.DomainStatusList, context);
     }
@@ -2363,7 +2364,7 @@ const deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = a
         $metadata: deserializeMetadata(output),
         LimitsByRole: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.LimitsByRole !== undefined && data.LimitsByRole !== null) {
         contents.LimitsByRole = deserializeAws_restJson1LimitsByRole(data.LimitsByRole, context);
     }
@@ -2452,12 +2453,12 @@ const deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsComman
         CrossClusterSearchConnections: undefined,
         NextToken: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.CrossClusterSearchConnections !== undefined && data.CrossClusterSearchConnections !== null) {
         contents.CrossClusterSearchConnections = deserializeAws_restJson1InboundCrossClusterSearchConnections(data.CrossClusterSearchConnections, context);
     }
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     return Promise.resolve(contents);
 };
@@ -2512,12 +2513,12 @@ const deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsComma
         CrossClusterSearchConnections: undefined,
         NextToken: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.CrossClusterSearchConnections !== undefined && data.CrossClusterSearchConnections !== null) {
         contents.CrossClusterSearchConnections = deserializeAws_restJson1OutboundCrossClusterSearchConnections(data.CrossClusterSearchConnections, context);
     }
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     return Promise.resolve(contents);
 };
@@ -2572,9 +2573,9 @@ const deserializeAws_restJson1DescribePackagesCommand = async (output, context)
         NextToken: undefined,
         PackageDetailsList: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     if (data.PackageDetailsList !== undefined && data.PackageDetailsList !== null) {
         contents.PackageDetailsList = deserializeAws_restJson1PackageDetailsList(data.PackageDetailsList, context);
@@ -2656,9 +2657,9 @@ const deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsComm
         NextToken: undefined,
         ReservedElasticsearchInstanceOfferings: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     if (data.ReservedElasticsearchInstanceOfferings !== undefined &&
         data.ReservedElasticsearchInstanceOfferings !== null) {
@@ -2733,9 +2734,9 @@ const deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand = as
         NextToken: undefined,
         ReservedElasticsearchInstances: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     if (data.ReservedElasticsearchInstances !== undefined && data.ReservedElasticsearchInstances !== null) {
         contents.ReservedElasticsearchInstances = deserializeAws_restJson1ReservedElasticsearchInstanceList(data.ReservedElasticsearchInstances, context);
@@ -2808,7 +2809,7 @@ const deserializeAws_restJson1DissociatePackageCommand = async (output, context)
         $metadata: deserializeMetadata(output),
         DomainPackageDetails: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainPackageDetails !== undefined && data.DomainPackageDetails !== null) {
         contents.DomainPackageDetails = deserializeAws_restJson1DomainPackageDetails(data.DomainPackageDetails, context);
     }
@@ -2896,7 +2897,7 @@ const deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = async
         $metadata: deserializeMetadata(output),
         CompatibleElasticsearchVersions: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.CompatibleElasticsearchVersions !== undefined && data.CompatibleElasticsearchVersions !== null) {
         contents.CompatibleElasticsearchVersions = deserializeAws_restJson1CompatibleElasticsearchVersionsList(data.CompatibleElasticsearchVersions, context);
     }
@@ -2978,12 +2979,12 @@ const deserializeAws_restJson1GetPackageVersionHistoryCommand = async (output, c
         PackageID: undefined,
         PackageVersionHistoryList: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     if (data.PackageID !== undefined && data.PackageID !== null) {
-        contents.PackageID = (0, smithy_client_1.expectString)(data.PackageID);
+        contents.PackageID = smithy_client_1.expectString(data.PackageID);
     }
     if (data.PackageVersionHistoryList !== undefined && data.PackageVersionHistoryList !== null) {
         contents.PackageVersionHistoryList = deserializeAws_restJson1PackageVersionHistoryList(data.PackageVersionHistoryList, context);
@@ -3065,9 +3066,9 @@ const deserializeAws_restJson1GetUpgradeHistoryCommand = async (output, context)
         NextToken: undefined,
         UpgradeHistories: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     if (data.UpgradeHistories !== undefined && data.UpgradeHistories !== null) {
         contents.UpgradeHistories = deserializeAws_restJson1UpgradeHistoryList(data.UpgradeHistories, context);
@@ -3150,15 +3151,15 @@ const deserializeAws_restJson1GetUpgradeStatusCommand = async (output, context)
         UpgradeName: undefined,
         UpgradeStep: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.StepStatus !== undefined && data.StepStatus !== null) {
-        contents.StepStatus = (0, smithy_client_1.expectString)(data.StepStatus);
+        contents.StepStatus = smithy_client_1.expectString(data.StepStatus);
     }
     if (data.UpgradeName !== undefined && data.UpgradeName !== null) {
-        contents.UpgradeName = (0, smithy_client_1.expectString)(data.UpgradeName);
+        contents.UpgradeName = smithy_client_1.expectString(data.UpgradeName);
     }
     if (data.UpgradeStep !== undefined && data.UpgradeStep !== null) {
-        contents.UpgradeStep = (0, smithy_client_1.expectString)(data.UpgradeStep);
+        contents.UpgradeStep = smithy_client_1.expectString(data.UpgradeStep);
     }
     return Promise.resolve(contents);
 };
@@ -3236,7 +3237,7 @@ const deserializeAws_restJson1ListDomainNamesCommand = async (output, context) =
         $metadata: deserializeMetadata(output),
         DomainNames: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainNames !== undefined && data.DomainNames !== null) {
         contents.DomainNames = deserializeAws_restJson1DomainInfoList(data.DomainNames, context);
     }
@@ -3293,12 +3294,12 @@ const deserializeAws_restJson1ListDomainsForPackageCommand = async (output, cont
         DomainPackageDetailsList: undefined,
         NextToken: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainPackageDetailsList !== undefined && data.DomainPackageDetailsList !== null) {
         contents.DomainPackageDetailsList = deserializeAws_restJson1DomainPackageDetailsList(data.DomainPackageDetailsList, context);
     }
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     return Promise.resolve(contents);
 };
@@ -3377,12 +3378,12 @@ const deserializeAws_restJson1ListElasticsearchInstanceTypesCommand = async (out
         ElasticsearchInstanceTypes: undefined,
         NextToken: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ElasticsearchInstanceTypes !== undefined && data.ElasticsearchInstanceTypes !== null) {
         contents.ElasticsearchInstanceTypes = deserializeAws_restJson1ElasticsearchInstanceTypeList(data.ElasticsearchInstanceTypes, context);
     }
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     return Promise.resolve(contents);
 };
@@ -3453,12 +3454,12 @@ const deserializeAws_restJson1ListElasticsearchVersionsCommand = async (output,
         ElasticsearchVersions: undefined,
         NextToken: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ElasticsearchVersions !== undefined && data.ElasticsearchVersions !== null) {
         contents.ElasticsearchVersions = deserializeAws_restJson1ElasticsearchVersionList(data.ElasticsearchVersions, context);
     }
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     return Promise.resolve(contents);
 };
@@ -3529,12 +3530,12 @@ const deserializeAws_restJson1ListPackagesForDomainCommand = async (output, cont
         DomainPackageDetailsList: undefined,
         NextToken: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainPackageDetailsList !== undefined && data.DomainPackageDetailsList !== null) {
         contents.DomainPackageDetailsList = deserializeAws_restJson1DomainPackageDetailsList(data.DomainPackageDetailsList, context);
     }
     if (data.NextToken !== undefined && data.NextToken !== null) {
-        contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
+        contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
     return Promise.resolve(contents);
 };
@@ -3612,7 +3613,7 @@ const deserializeAws_restJson1ListTagsCommand = async (output, context) => {
         $metadata: deserializeMetadata(output),
         TagList: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.TagList !== undefined && data.TagList !== null) {
         contents.TagList = deserializeAws_restJson1TagList(data.TagList, context);
     }
@@ -3685,12 +3686,12 @@ const deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingComma
         ReservationName: undefined,
         ReservedElasticsearchInstanceId: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ReservationName !== undefined && data.ReservationName !== null) {
-        contents.ReservationName = (0, smithy_client_1.expectString)(data.ReservationName);
+        contents.ReservationName = smithy_client_1.expectString(data.ReservationName);
     }
     if (data.ReservedElasticsearchInstanceId !== undefined && data.ReservedElasticsearchInstanceId !== null) {
-        contents.ReservedElasticsearchInstanceId = (0, smithy_client_1.expectString)(data.ReservedElasticsearchInstanceId);
+        contents.ReservedElasticsearchInstanceId = smithy_client_1.expectString(data.ReservedElasticsearchInstanceId);
     }
     return Promise.resolve(contents);
 };
@@ -3776,7 +3777,7 @@ const deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand =
         $metadata: deserializeMetadata(output),
         CrossClusterSearchConnection: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
         contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
     }
@@ -3892,7 +3893,7 @@ const deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommand = a
         $metadata: deserializeMetadata(output),
         ServiceSoftwareOptions: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ServiceSoftwareOptions !== undefined && data.ServiceSoftwareOptions !== null) {
         contents.ServiceSoftwareOptions = deserializeAws_restJson1ServiceSoftwareOptions(data.ServiceSoftwareOptions, context);
     }
@@ -3964,7 +3965,7 @@ const deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand = async (ou
         $metadata: deserializeMetadata(output),
         DomainConfig: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainConfig !== undefined && data.DomainConfig !== null) {
         contents.DomainConfig = deserializeAws_restJson1ElasticsearchDomainConfig(data.DomainConfig, context);
     }
@@ -4052,7 +4053,7 @@ const deserializeAws_restJson1UpdatePackageCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
         PackageDetails: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.PackageDetails !== undefined && data.PackageDetails !== null) {
         contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
     }
@@ -4142,15 +4143,15 @@ const deserializeAws_restJson1UpgradeElasticsearchDomainCommand = async (output,
         PerformCheckOnly: undefined,
         TargetVersion: undefined,
     };
-    const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.DomainName !== undefined && data.DomainName !== null) {
-        contents.DomainName = (0, smithy_client_1.expectString)(data.DomainName);
+        contents.DomainName = smithy_client_1.expectString(data.DomainName);
     }
     if (data.PerformCheckOnly !== undefined && data.PerformCheckOnly !== null) {
-        contents.PerformCheckOnly = (0, smithy_client_1.expectBoolean)(data.PerformCheckOnly);
+        contents.PerformCheckOnly = smithy_client_1.expectBoolean(data.PerformCheckOnly);
     }
     if (data.TargetVersion !== undefined && data.TargetVersion !== null) {
-        contents.TargetVersion = (0, smithy_client_1.expectString)(data.TargetVersion);
+        contents.TargetVersion = smithy_client_1.expectString(data.TargetVersion);
     }
     return Promise.resolve(contents);
 };
@@ -4237,7 +4238,7 @@ const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutpu
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4250,7 +4251,7 @@ const deserializeAws_restJson1BaseExceptionResponse = async (parsedOutput, conte
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4263,7 +4264,7 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4276,7 +4277,7 @@ const deserializeAws_restJson1DisabledOperationExceptionResponse = async (parsed
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4289,7 +4290,7 @@ const deserializeAws_restJson1InternalExceptionResponse = async (parsedOutput, c
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4302,7 +4303,7 @@ const deserializeAws_restJson1InvalidPaginationTokenExceptionResponse = async (p
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4315,7 +4316,7 @@ const deserializeAws_restJson1InvalidTypeExceptionResponse = async (parsedOutput
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4328,7 +4329,7 @@ const deserializeAws_restJson1LimitExceededExceptionResponse = async (parsedOutp
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4341,7 +4342,7 @@ const deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse = async (pa
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4354,7 +4355,7 @@ const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedO
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4367,7 +4368,7 @@ const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput,
     };
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
-        contents.message = (0, smithy_client_1.expectString)(data.message);
+        contents.message = smithy_client_1.expectString(data.message);
     }
     return contents;
 };
@@ -4691,7 +4692,7 @@ const serializeAws_restJson1ZoneAwarenessConfig = (input, context) => {
 };
 const deserializeAws_restJson1AccessPoliciesStatus = (output, context) => {
     return {
-        Options: (0, smithy_client_1.expectString)(output.Options),
+        Options: smithy_client_1.expectString(output.Options),
         Status: output.Status !== undefined && output.Status !== null
             ? deserializeAws_restJson1OptionStatus(output.Status, context)
             : undefined,
@@ -4699,7 +4700,7 @@ const deserializeAws_restJson1AccessPoliciesStatus = (output, context) => {
 };
 const deserializeAws_restJson1AdditionalLimit = (output, context) => {
     return {
-        LimitName: (0, smithy_client_1.expectString)(output.LimitName),
+        LimitName: smithy_client_1.expectString(output.LimitName),
         LimitValues: output.LimitValues !== undefined && output.LimitValues !== null
             ? deserializeAws_restJson1LimitValueList(output.LimitValues, context)
             : undefined,
@@ -4722,7 +4723,7 @@ const deserializeAws_restJson1AdvancedOptions = (output, context) => {
         }
         return {
             ...acc,
-            [key]: (0, smithy_client_1.expectString)(value),
+            [key]: smithy_client_1.expectString(value),
         };
     }, {});
 };
@@ -4738,8 +4739,8 @@ const deserializeAws_restJson1AdvancedOptionsStatus = (output, context) => {
 };
 const deserializeAws_restJson1AdvancedSecurityOptions = (output, context) => {
     return {
-        Enabled: (0, smithy_client_1.expectBoolean)(output.Enabled),
-        InternalUserDatabaseEnabled: (0, smithy_client_1.expectBoolean)(output.InternalUserDatabaseEnabled),
+        Enabled: smithy_client_1.expectBoolean(output.Enabled),
+        InternalUserDatabaseEnabled: smithy_client_1.expectBoolean(output.InternalUserDatabaseEnabled),
         SAMLOptions: output.SAMLOptions !== undefined && output.SAMLOptions !== null
             ? deserializeAws_restJson1SAMLOptionsOutput(output.SAMLOptions, context)
             : undefined,
@@ -4760,7 +4761,7 @@ const deserializeAws_restJson1AutoTune = (output, context) => {
         AutoTuneDetails: output.AutoTuneDetails !== undefined && output.AutoTuneDetails !== null
             ? deserializeAws_restJson1AutoTuneDetails(output.AutoTuneDetails, context)
             : undefined,
-        AutoTuneType: (0, smithy_client_1.expectString)(output.AutoTuneType),
+        AutoTuneType: smithy_client_1.expectString(output.AutoTuneType),
     };
 };
 const deserializeAws_restJson1AutoTuneDetails = (output, context) => {
@@ -4782,11 +4783,13 @@ const deserializeAws_restJson1AutoTuneList = (output, context) => {
 };
 const deserializeAws_restJson1AutoTuneMaintenanceSchedule = (output, context) => {
     return {
-        CronExpressionForRecurrence: (0, smithy_client_1.expectString)(output.CronExpressionForRecurrence),
+        CronExpressionForRecurrence: smithy_client_1.expectString(output.CronExpressionForRecurrence),
         Duration: output.Duration !== undefined && output.Duration !== null
             ? deserializeAws_restJson1Duration(output.Duration, context)
             : undefined,
-        StartAt: output.StartAt !== undefined && output.StartAt !== null ? new Date(Math.round(output.StartAt * 1000)) : undefined,
+        StartAt: output.StartAt !== undefined && output.StartAt !== null
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.StartAt)))
+            : undefined,
     };
 };
 const deserializeAws_restJson1AutoTuneMaintenanceScheduleList = (output, context) => {
@@ -4801,17 +4804,17 @@ const deserializeAws_restJson1AutoTuneMaintenanceScheduleList = (output, context
 };
 const deserializeAws_restJson1AutoTuneOptions = (output, context) => {
     return {
-        DesiredState: (0, smithy_client_1.expectString)(output.DesiredState),
+        DesiredState: smithy_client_1.expectString(output.DesiredState),
         MaintenanceSchedules: output.MaintenanceSchedules !== undefined && output.MaintenanceSchedules !== null
             ? deserializeAws_restJson1AutoTuneMaintenanceScheduleList(output.MaintenanceSchedules, context)
             : undefined,
-        RollbackOnDisable: (0, smithy_client_1.expectString)(output.RollbackOnDisable),
+        RollbackOnDisable: smithy_client_1.expectString(output.RollbackOnDisable),
     };
 };
 const deserializeAws_restJson1AutoTuneOptionsOutput = (output, context) => {
     return {
-        ErrorMessage: (0, smithy_client_1.expectString)(output.ErrorMessage),
-        State: (0, smithy_client_1.expectString)(output.State),
+        ErrorMessage: smithy_client_1.expectString(output.ErrorMessage),
+        State: smithy_client_1.expectString(output.State),
     };
 };
 const deserializeAws_restJson1AutoTuneOptionsStatus = (output, context) => {
@@ -4827,23 +4830,23 @@ const deserializeAws_restJson1AutoTuneOptionsStatus = (output, context) => {
 const deserializeAws_restJson1AutoTuneStatus = (output, context) => {
     return {
         CreationDate: output.CreationDate !== undefined && output.CreationDate !== null
-            ? new Date(Math.round(output.CreationDate * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.CreationDate)))
             : undefined,
-        ErrorMessage: (0, smithy_client_1.expectString)(output.ErrorMessage),
-        PendingDeletion: (0, smithy_client_1.expectBoolean)(output.PendingDeletion),
-        State: (0, smithy_client_1.expectString)(output.State),
+        ErrorMessage: smithy_client_1.expectString(output.ErrorMessage),
+        PendingDeletion: smithy_client_1.expectBoolean(output.PendingDeletion),
+        State: smithy_client_1.expectString(output.State),
         UpdateDate: output.UpdateDate !== undefined && output.UpdateDate !== null
-            ? new Date(Math.round(output.UpdateDate * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.UpdateDate)))
             : undefined,
-        UpdateVersion: (0, smithy_client_1.expectInt32)(output.UpdateVersion),
+        UpdateVersion: smithy_client_1.expectInt32(output.UpdateVersion),
     };
 };
 const deserializeAws_restJson1CognitoOptions = (output, context) => {
     return {
-        Enabled: (0, smithy_client_1.expectBoolean)(output.Enabled),
-        IdentityPoolId: (0, smithy_client_1.expectString)(output.IdentityPoolId),
-        RoleArn: (0, smithy_client_1.expectString)(output.RoleArn),
-        UserPoolId: (0, smithy_client_1.expectString)(output.UserPoolId),
+        Enabled: smithy_client_1.expectBoolean(output.Enabled),
+        IdentityPoolId: smithy_client_1.expectString(output.IdentityPoolId),
+        RoleArn: smithy_client_1.expectString(output.RoleArn),
+        UserPoolId: smithy_client_1.expectString(output.UserPoolId),
     };
 };
 const deserializeAws_restJson1CognitoOptionsStatus = (output, context) => {
@@ -4858,7 +4861,7 @@ const deserializeAws_restJson1CognitoOptionsStatus = (output, context) => {
 };
 const deserializeAws_restJson1ColdStorageOptions = (output, context) => {
     return {
-        Enabled: (0, smithy_client_1.expectBoolean)(output.Enabled),
+        Enabled: smithy_client_1.expectBoolean(output.Enabled),
     };
 };
 const deserializeAws_restJson1CompatibleElasticsearchVersionsList = (output, context) => {
@@ -4873,7 +4876,7 @@ const deserializeAws_restJson1CompatibleElasticsearchVersionsList = (output, con
 };
 const deserializeAws_restJson1CompatibleVersionsMap = (output, context) => {
     return {
-        SourceVersion: (0, smithy_client_1.expectString)(output.SourceVersion),
+        SourceVersion: smithy_client_1.expectString(output.SourceVersion),
         TargetVersions: output.TargetVersions !== undefined && output.TargetVersions !== null
             ? deserializeAws_restJson1ElasticsearchVersionList(output.TargetVersions, context)
             : undefined,
@@ -4881,11 +4884,11 @@ const deserializeAws_restJson1CompatibleVersionsMap = (output, context) => {
 };
 const deserializeAws_restJson1DomainEndpointOptions = (output, context) => {
     return {
-        CustomEndpoint: (0, smithy_client_1.expectString)(output.CustomEndpoint),
-        CustomEndpointCertificateArn: (0, smithy_client_1.expectString)(output.CustomEndpointCertificateArn),
-        CustomEndpointEnabled: (0, smithy_client_1.expectBoolean)(output.CustomEndpointEnabled),
-        EnforceHTTPS: (0, smithy_client_1.expectBoolean)(output.EnforceHTTPS),
-        TLSSecurityPolicy: (0, smithy_client_1.expectString)(output.TLSSecurityPolicy),
+        CustomEndpoint: smithy_client_1.expectString(output.CustomEndpoint),
+        CustomEndpointCertificateArn: smithy_client_1.expectString(output.CustomEndpointCertificateArn),
+        CustomEndpointEnabled: smithy_client_1.expectBoolean(output.CustomEndpointEnabled),
+        EnforceHTTPS: smithy_client_1.expectBoolean(output.EnforceHTTPS),
+        TLSSecurityPolicy: smithy_client_1.expectString(output.TLSSecurityPolicy),
     };
 };
 const deserializeAws_restJson1DomainEndpointOptionsStatus = (output, context) => {
@@ -4900,7 +4903,8 @@ const deserializeAws_restJson1DomainEndpointOptionsStatus = (output, context) =>
 };
 const deserializeAws_restJson1DomainInfo = (output, context) => {
     return {
-        DomainName: (0, smithy_client_1.expectString)(output.DomainName),
+        DomainName: smithy_client_1.expectString(output.DomainName),
+        EngineType: smithy_client_1.expectString(output.EngineType),
     };
 };
 const deserializeAws_restJson1DomainInfoList = (output, context) => {
@@ -4915,26 +4919,26 @@ const deserializeAws_restJson1DomainInfoList = (output, context) => {
 };
 const deserializeAws_restJson1DomainInformation = (output, context) => {
     return {
-        DomainName: (0, smithy_client_1.expectString)(output.DomainName),
-        OwnerId: (0, smithy_client_1.expectString)(output.OwnerId),
-        Region: (0, smithy_client_1.expectString)(output.Region),
+        DomainName: smithy_client_1.expectString(output.DomainName),
+        OwnerId: smithy_client_1.expectString(output.OwnerId),
+        Region: smithy_client_1.expectString(output.Region),
     };
 };
 const deserializeAws_restJson1DomainPackageDetails = (output, context) => {
     return {
-        DomainName: (0, smithy_client_1.expectString)(output.DomainName),
-        DomainPackageStatus: (0, smithy_client_1.expectString)(output.DomainPackageStatus),
+        DomainName: smithy_client_1.expectString(output.DomainName),
+        DomainPackageStatus: smithy_client_1.expectString(output.DomainPackageStatus),
         ErrorDetails: output.ErrorDetails !== undefined && output.ErrorDetails !== null
             ? deserializeAws_restJson1ErrorDetails(output.ErrorDetails, context)
             : undefined,
         LastUpdated: output.LastUpdated !== undefined && output.LastUpdated !== null
-            ? new Date(Math.round(output.LastUpdated * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.LastUpdated)))
             : undefined,
-        PackageID: (0, smithy_client_1.expectString)(output.PackageID),
-        PackageName: (0, smithy_client_1.expectString)(output.PackageName),
-        PackageType: (0, smithy_client_1.expectString)(output.PackageType),
-        PackageVersion: (0, smithy_client_1.expectString)(output.PackageVersion),
-        ReferencePath: (0, smithy_client_1.expectString)(output.ReferencePath),
+        PackageID: smithy_client_1.expectString(output.PackageID),
+        PackageName: smithy_client_1.expectString(output.PackageName),
+        PackageType: smithy_client_1.expectString(output.PackageType),
+        PackageVersion: smithy_client_1.expectString(output.PackageVersion),
+        ReferencePath: smithy_client_1.expectString(output.ReferencePath),
     };
 };
 const deserializeAws_restJson1DomainPackageDetailsList = (output, context) => {
@@ -4949,16 +4953,16 @@ const deserializeAws_restJson1DomainPackageDetailsList = (output, context) => {
 };
 const deserializeAws_restJson1Duration = (output, context) => {
     return {
-        Unit: (0, smithy_client_1.expectString)(output.Unit),
-        Value: (0, smithy_client_1.expectLong)(output.Value),
+        Unit: smithy_client_1.expectString(output.Unit),
+        Value: smithy_client_1.expectLong(output.Value),
     };
 };
 const deserializeAws_restJson1EBSOptions = (output, context) => {
     return {
-        EBSEnabled: (0, smithy_client_1.expectBoolean)(output.EBSEnabled),
-        Iops: (0, smithy_client_1.expectInt32)(output.Iops),
-        VolumeSize: (0, smithy_client_1.expectInt32)(output.VolumeSize),
-        VolumeType: (0, smithy_client_1.expectString)(output.VolumeType),
+        EBSEnabled: smithy_client_1.expectBoolean(output.EBSEnabled),
+        Iops: smithy_client_1.expectInt32(output.Iops),
+        VolumeSize: smithy_client_1.expectInt32(output.VolumeSize),
+        VolumeType: smithy_client_1.expectString(output.VolumeType),
     };
 };
 const deserializeAws_restJson1EBSOptionsStatus = (output, context) => {
@@ -4976,18 +4980,18 @@ const deserializeAws_restJson1ElasticsearchClusterConfig = (output, context) =>
         ColdStorageOptions: output.ColdStorageOptions !== undefined && output.ColdStorageOptions !== null
             ? deserializeAws_restJson1ColdStorageOptions(output.ColdStorageOptions, context)
             : undefined,
-        DedicatedMasterCount: (0, smithy_client_1.expectInt32)(output.DedicatedMasterCount),
-        DedicatedMasterEnabled: (0, smithy_client_1.expectBoolean)(output.DedicatedMasterEnabled),
-        DedicatedMasterType: (0, smithy_client_1.expectString)(output.DedicatedMasterType),
-        InstanceCount: (0, smithy_client_1.expectInt32)(output.InstanceCount),
-        InstanceType: (0, smithy_client_1.expectString)(output.InstanceType),
-        WarmCount: (0, smithy_client_1.expectInt32)(output.WarmCount),
-        WarmEnabled: (0, smithy_client_1.expectBoolean)(output.WarmEnabled),
-        WarmType: (0, smithy_client_1.expectString)(output.WarmType),
+        DedicatedMasterCount: smithy_client_1.expectInt32(output.DedicatedMasterCount),
+        DedicatedMasterEnabled: smithy_client_1.expectBoolean(output.DedicatedMasterEnabled),
+        DedicatedMasterType: smithy_client_1.expectString(output.DedicatedMasterType),
+        InstanceCount: smithy_client_1.expectInt32(output.InstanceCount),
+        InstanceType: smithy_client_1.expectString(output.InstanceType),
+        WarmCount: smithy_client_1.expectInt32(output.WarmCount),
+        WarmEnabled: smithy_client_1.expectBoolean(output.WarmEnabled),
+        WarmType: smithy_client_1.expectString(output.WarmType),
         ZoneAwarenessConfig: output.ZoneAwarenessConfig !== undefined && output.ZoneAwarenessConfig !== null
             ? deserializeAws_restJson1ZoneAwarenessConfig(output.ZoneAwarenessConfig, context)
             : undefined,
-        ZoneAwarenessEnabled: (0, smithy_client_1.expectBoolean)(output.ZoneAwarenessEnabled),
+        ZoneAwarenessEnabled: smithy_client_1.expectBoolean(output.ZoneAwarenessEnabled),
     };
 };
 const deserializeAws_restJson1ElasticsearchClusterConfigStatus = (output, context) => {
@@ -5048,8 +5052,8 @@ const deserializeAws_restJson1ElasticsearchDomainConfig = (output, context) => {
 };
 const deserializeAws_restJson1ElasticsearchDomainStatus = (output, context) => {
     return {
-        ARN: (0, smithy_client_1.expectString)(output.ARN),
-        AccessPolicies: (0, smithy_client_1.expectString)(output.AccessPolicies),
+        ARN: smithy_client_1.expectString(output.ARN),
+        AccessPolicies: smithy_client_1.expectString(output.AccessPolicies),
         AdvancedOptions: output.AdvancedOptions !== undefined && output.AdvancedOptions !== null
             ? deserializeAws_restJson1AdvancedOptions(output.AdvancedOptions, context)
             : undefined,
@@ -5062,24 +5066,24 @@ const deserializeAws_restJson1ElasticsearchDomainStatus = (output, context) => {
         CognitoOptions: output.CognitoOptions !== undefined && output.CognitoOptions !== null
             ? deserializeAws_restJson1CognitoOptions(output.CognitoOptions, context)
             : undefined,
-        Created: (0, smithy_client_1.expectBoolean)(output.Created),
-        Deleted: (0, smithy_client_1.expectBoolean)(output.Deleted),
+        Created: smithy_client_1.expectBoolean(output.Created),
+        Deleted: smithy_client_1.expectBoolean(output.Deleted),
         DomainEndpointOptions: output.DomainEndpointOptions !== undefined && output.DomainEndpointOptions !== null
             ? deserializeAws_restJson1DomainEndpointOptions(output.DomainEndpointOptions, context)
             : undefined,
-        DomainId: (0, smithy_client_1.expectString)(output.DomainId),
-        DomainName: (0, smithy_client_1.expectString)(output.DomainName),
+        DomainId: smithy_client_1.expectString(output.DomainId),
+        DomainName: smithy_client_1.expectString(output.DomainName),
         EBSOptions: output.EBSOptions !== undefined && output.EBSOptions !== null
             ? deserializeAws_restJson1EBSOptions(output.EBSOptions, context)
             : undefined,
         ElasticsearchClusterConfig: output.ElasticsearchClusterConfig !== undefined && output.ElasticsearchClusterConfig !== null
             ? deserializeAws_restJson1ElasticsearchClusterConfig(output.ElasticsearchClusterConfig, context)
             : undefined,
-        ElasticsearchVersion: (0, smithy_client_1.expectString)(output.ElasticsearchVersion),
+        ElasticsearchVersion: smithy_client_1.expectString(output.ElasticsearchVersion),
         EncryptionAtRestOptions: output.EncryptionAtRestOptions !== undefined && output.EncryptionAtRestOptions !== null
             ? deserializeAws_restJson1EncryptionAtRestOptions(output.EncryptionAtRestOptions, context)
             : undefined,
-        Endpoint: (0, smithy_client_1.expectString)(output.Endpoint),
+        Endpoint: smithy_client_1.expectString(output.Endpoint),
         Endpoints: output.Endpoints !== undefined && output.Endpoints !== null
             ? deserializeAws_restJson1EndpointsMap(output.Endpoints, context)
             : undefined,
@@ -5089,14 +5093,14 @@ const deserializeAws_restJson1ElasticsearchDomainStatus = (output, context) => {
         NodeToNodeEncryptionOptions: output.NodeToNodeEncryptionOptions !== undefined && output.NodeToNodeEncryptionOptions !== null
             ? deserializeAws_restJson1NodeToNodeEncryptionOptions(output.NodeToNodeEncryptionOptions, context)
             : undefined,
-        Processing: (0, smithy_client_1.expectBoolean)(output.Processing),
+        Processing: smithy_client_1.expectBoolean(output.Processing),
         ServiceSoftwareOptions: output.ServiceSoftwareOptions !== undefined && output.ServiceSoftwareOptions !== null
             ? deserializeAws_restJson1ServiceSoftwareOptions(output.ServiceSoftwareOptions, context)
             : undefined,
         SnapshotOptions: output.SnapshotOptions !== undefined && output.SnapshotOptions !== null
             ? deserializeAws_restJson1SnapshotOptions(output.SnapshotOptions, context)
             : undefined,
-        UpgradeProcessing: (0, smithy_client_1.expectBoolean)(output.UpgradeProcessing),
+        UpgradeProcessing: smithy_client_1.expectBoolean(output.UpgradeProcessing),
         VPCOptions: output.VPCOptions !== undefined && output.VPCOptions !== null
             ? deserializeAws_restJson1VPCDerivedInfo(output.VPCOptions, context)
             : undefined,
@@ -5119,7 +5123,7 @@ const deserializeAws_restJson1ElasticsearchInstanceTypeList = (output, context)
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_restJson1ElasticsearchVersionList = (output, context) => {
@@ -5129,12 +5133,12 @@ const deserializeAws_restJson1ElasticsearchVersionList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_restJson1ElasticsearchVersionStatus = (output, context) => {
     return {
-        Options: (0, smithy_client_1.expectString)(output.Options),
+        Options: smithy_client_1.expectString(output.Options),
         Status: output.Status !== undefined && output.Status !== null
             ? deserializeAws_restJson1OptionStatus(output.Status, context)
             : undefined,
@@ -5142,8 +5146,8 @@ const deserializeAws_restJson1ElasticsearchVersionStatus = (output, context) =>
 };
 const deserializeAws_restJson1EncryptionAtRestOptions = (output, context) => {
     return {
-        Enabled: (0, smithy_client_1.expectBoolean)(output.Enabled),
-        KmsKeyId: (0, smithy_client_1.expectString)(output.KmsKeyId),
+        Enabled: smithy_client_1.expectBoolean(output.Enabled),
+        KmsKeyId: smithy_client_1.expectString(output.KmsKeyId),
     };
 };
 const deserializeAws_restJson1EncryptionAtRestOptionsStatus = (output, context) => {
@@ -5163,14 +5167,14 @@ const deserializeAws_restJson1EndpointsMap = (output, context) => {
         }
         return {
             ...acc,
-            [key]: (0, smithy_client_1.expectString)(value),
+            [key]: smithy_client_1.expectString(value),
         };
     }, {});
 };
 const deserializeAws_restJson1ErrorDetails = (output, context) => {
     return {
-        ErrorMessage: (0, smithy_client_1.expectString)(output.ErrorMessage),
-        ErrorType: (0, smithy_client_1.expectString)(output.ErrorType),
+        ErrorMessage: smithy_client_1.expectString(output.ErrorMessage),
+        ErrorType: smithy_client_1.expectString(output.ErrorType),
     };
 };
 const deserializeAws_restJson1InboundCrossClusterSearchConnection = (output, context) => {
@@ -5178,7 +5182,7 @@ const deserializeAws_restJson1InboundCrossClusterSearchConnection = (output, con
         ConnectionStatus: output.ConnectionStatus !== undefined && output.ConnectionStatus !== null
             ? deserializeAws_restJson1InboundCrossClusterSearchConnectionStatus(output.ConnectionStatus, context)
             : undefined,
-        CrossClusterSearchConnectionId: (0, smithy_client_1.expectString)(output.CrossClusterSearchConnectionId),
+        CrossClusterSearchConnectionId: smithy_client_1.expectString(output.CrossClusterSearchConnectionId),
         DestinationDomainInfo: output.DestinationDomainInfo !== undefined && output.DestinationDomainInfo !== null
             ? deserializeAws_restJson1DomainInformation(output.DestinationDomainInfo, context)
             : undefined,
@@ -5199,14 +5203,14 @@ const deserializeAws_restJson1InboundCrossClusterSearchConnections = (output, co
 };
 const deserializeAws_restJson1InboundCrossClusterSearchConnectionStatus = (output, context) => {
     return {
-        Message: (0, smithy_client_1.expectString)(output.Message),
-        StatusCode: (0, smithy_client_1.expectString)(output.StatusCode),
+        Message: smithy_client_1.expectString(output.Message),
+        StatusCode: smithy_client_1.expectString(output.StatusCode),
     };
 };
 const deserializeAws_restJson1InstanceCountLimits = (output, context) => {
     return {
-        MaximumInstanceCount: (0, smithy_client_1.expectInt32)(output.MaximumInstanceCount),
-        MinimumInstanceCount: (0, smithy_client_1.expectInt32)(output.MinimumInstanceCount),
+        MaximumInstanceCount: smithy_client_1.expectInt32(output.MaximumInstanceCount),
+        MinimumInstanceCount: smithy_client_1.expectInt32(output.MinimumInstanceCount),
     };
 };
 const deserializeAws_restJson1InstanceLimits = (output, context) => {
@@ -5223,7 +5227,7 @@ const deserializeAws_restJson1Issues = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_restJson1Limits = (output, context) => {
@@ -5257,13 +5261,13 @@ const deserializeAws_restJson1LimitValueList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_restJson1LogPublishingOption = (output, context) => {
     return {
-        CloudWatchLogsLogGroupArn: (0, smithy_client_1.expectString)(output.CloudWatchLogsLogGroupArn),
-        Enabled: (0, smithy_client_1.expectBoolean)(output.Enabled),
+        CloudWatchLogsLogGroupArn: smithy_client_1.expectString(output.CloudWatchLogsLogGroupArn),
+        Enabled: smithy_client_1.expectBoolean(output.Enabled),
     };
 };
 const deserializeAws_restJson1LogPublishingOptions = (output, context) => {
@@ -5289,7 +5293,7 @@ const deserializeAws_restJson1LogPublishingOptionsStatus = (output, context) =>
 };
 const deserializeAws_restJson1NodeToNodeEncryptionOptions = (output, context) => {
     return {
-        Enabled: (0, smithy_client_1.expectBoolean)(output.Enabled),
+        Enabled: smithy_client_1.expectBoolean(output.Enabled),
     };
 };
 const deserializeAws_restJson1NodeToNodeEncryptionOptionsStatus = (output, context) => {
@@ -5305,23 +5309,23 @@ const deserializeAws_restJson1NodeToNodeEncryptionOptionsStatus = (output, conte
 const deserializeAws_restJson1OptionStatus = (output, context) => {
     return {
         CreationDate: output.CreationDate !== undefined && output.CreationDate !== null
-            ? new Date(Math.round(output.CreationDate * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.CreationDate)))
             : undefined,
-        PendingDeletion: (0, smithy_client_1.expectBoolean)(output.PendingDeletion),
-        State: (0, smithy_client_1.expectString)(output.State),
+        PendingDeletion: smithy_client_1.expectBoolean(output.PendingDeletion),
+        State: smithy_client_1.expectString(output.State),
         UpdateDate: output.UpdateDate !== undefined && output.UpdateDate !== null
-            ? new Date(Math.round(output.UpdateDate * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.UpdateDate)))
             : undefined,
-        UpdateVersion: (0, smithy_client_1.expectInt32)(output.UpdateVersion),
+        UpdateVersion: smithy_client_1.expectInt32(output.UpdateVersion),
     };
 };
 const deserializeAws_restJson1OutboundCrossClusterSearchConnection = (output, context) => {
     return {
-        ConnectionAlias: (0, smithy_client_1.expectString)(output.ConnectionAlias),
+        ConnectionAlias: smithy_client_1.expectString(output.ConnectionAlias),
         ConnectionStatus: output.ConnectionStatus !== undefined && output.ConnectionStatus !== null
             ? deserializeAws_restJson1OutboundCrossClusterSearchConnectionStatus(output.ConnectionStatus, context)
             : undefined,
-        CrossClusterSearchConnectionId: (0, smithy_client_1.expectString)(output.CrossClusterSearchConnectionId),
+        CrossClusterSearchConnectionId: smithy_client_1.expectString(output.CrossClusterSearchConnectionId),
         DestinationDomainInfo: output.DestinationDomainInfo !== undefined && output.DestinationDomainInfo !== null
             ? deserializeAws_restJson1DomainInformation(output.DestinationDomainInfo, context)
             : undefined,
@@ -5342,27 +5346,27 @@ const deserializeAws_restJson1OutboundCrossClusterSearchConnections = (output, c
 };
 const deserializeAws_restJson1OutboundCrossClusterSearchConnectionStatus = (output, context) => {
     return {
-        Message: (0, smithy_client_1.expectString)(output.Message),
-        StatusCode: (0, smithy_client_1.expectString)(output.StatusCode),
+        Message: smithy_client_1.expectString(output.Message),
+        StatusCode: smithy_client_1.expectString(output.StatusCode),
     };
 };
 const deserializeAws_restJson1PackageDetails = (output, context) => {
     return {
-        AvailablePackageVersion: (0, smithy_client_1.expectString)(output.AvailablePackageVersion),
+        AvailablePackageVersion: smithy_client_1.expectString(output.AvailablePackageVersion),
         CreatedAt: output.CreatedAt !== undefined && output.CreatedAt !== null
-            ? new Date(Math.round(output.CreatedAt * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.CreatedAt)))
             : undefined,
         ErrorDetails: output.ErrorDetails !== undefined && output.ErrorDetails !== null
             ? deserializeAws_restJson1ErrorDetails(output.ErrorDetails, context)
             : undefined,
         LastUpdatedAt: output.LastUpdatedAt !== undefined && output.LastUpdatedAt !== null
-            ? new Date(Math.round(output.LastUpdatedAt * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.LastUpdatedAt)))
             : undefined,
-        PackageDescription: (0, smithy_client_1.expectString)(output.PackageDescription),
-        PackageID: (0, smithy_client_1.expectString)(output.PackageID),
-        PackageName: (0, smithy_client_1.expectString)(output.PackageName),
-        PackageStatus: (0, smithy_client_1.expectString)(output.PackageStatus),
-        PackageType: (0, smithy_client_1.expectString)(output.PackageType),
+        PackageDescription: smithy_client_1.expectString(output.PackageDescription),
+        PackageID: smithy_client_1.expectString(output.PackageID),
+        PackageName: smithy_client_1.expectString(output.PackageName),
+        PackageStatus: smithy_client_1.expectString(output.PackageStatus),
+        PackageType: smithy_client_1.expectString(output.PackageType),
     };
 };
 const deserializeAws_restJson1PackageDetailsList = (output, context) => {
@@ -5377,11 +5381,11 @@ const deserializeAws_restJson1PackageDetailsList = (output, context) => {
 };
 const deserializeAws_restJson1PackageVersionHistory = (output, context) => {
     return {
-        CommitMessage: (0, smithy_client_1.expectString)(output.CommitMessage),
+        CommitMessage: smithy_client_1.expectString(output.CommitMessage),
         CreatedAt: output.CreatedAt !== undefined && output.CreatedAt !== null
-            ? new Date(Math.round(output.CreatedAt * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.CreatedAt)))
             : undefined,
-        PackageVersion: (0, smithy_client_1.expectString)(output.PackageVersion),
+        PackageVersion: smithy_client_1.expectString(output.PackageVersion),
     };
 };
 const deserializeAws_restJson1PackageVersionHistoryList = (output, context) => {
@@ -5396,8 +5400,8 @@ const deserializeAws_restJson1PackageVersionHistoryList = (output, context) => {
 };
 const deserializeAws_restJson1RecurringCharge = (output, context) => {
     return {
-        RecurringChargeAmount: (0, smithy_client_1.limitedParseDouble)(output.RecurringChargeAmount),
-        RecurringChargeFrequency: (0, smithy_client_1.expectString)(output.RecurringChargeFrequency),
+        RecurringChargeAmount: smithy_client_1.limitedParseDouble(output.RecurringChargeAmount),
+        RecurringChargeFrequency: smithy_client_1.expectString(output.RecurringChargeFrequency),
     };
 };
 const deserializeAws_restJson1RecurringChargeList = (output, context) => {
@@ -5412,23 +5416,23 @@ const deserializeAws_restJson1RecurringChargeList = (output, context) => {
 };
 const deserializeAws_restJson1ReservedElasticsearchInstance = (output, context) => {
     return {
-        CurrencyCode: (0, smithy_client_1.expectString)(output.CurrencyCode),
-        Duration: (0, smithy_client_1.expectInt32)(output.Duration),
-        ElasticsearchInstanceCount: (0, smithy_client_1.expectInt32)(output.ElasticsearchInstanceCount),
-        ElasticsearchInstanceType: (0, smithy_client_1.expectString)(output.ElasticsearchInstanceType),
-        FixedPrice: (0, smithy_client_1.limitedParseDouble)(output.FixedPrice),
-        PaymentOption: (0, smithy_client_1.expectString)(output.PaymentOption),
+        CurrencyCode: smithy_client_1.expectString(output.CurrencyCode),
+        Duration: smithy_client_1.expectInt32(output.Duration),
+        ElasticsearchInstanceCount: smithy_client_1.expectInt32(output.ElasticsearchInstanceCount),
+        ElasticsearchInstanceType: smithy_client_1.expectString(output.ElasticsearchInstanceType),
+        FixedPrice: smithy_client_1.limitedParseDouble(output.FixedPrice),
+        PaymentOption: smithy_client_1.expectString(output.PaymentOption),
         RecurringCharges: output.RecurringCharges !== undefined && output.RecurringCharges !== null
             ? deserializeAws_restJson1RecurringChargeList(output.RecurringCharges, context)
             : undefined,
-        ReservationName: (0, smithy_client_1.expectString)(output.ReservationName),
-        ReservedElasticsearchInstanceId: (0, smithy_client_1.expectString)(output.ReservedElasticsearchInstanceId),
-        ReservedElasticsearchInstanceOfferingId: (0, smithy_client_1.expectString)(output.ReservedElasticsearchInstanceOfferingId),
+        ReservationName: smithy_client_1.expectString(output.ReservationName),
+        ReservedElasticsearchInstanceId: smithy_client_1.expectString(output.ReservedElasticsearchInstanceId),
+        ReservedElasticsearchInstanceOfferingId: smithy_client_1.expectString(output.ReservedElasticsearchInstanceOfferingId),
         StartTime: output.StartTime !== undefined && output.StartTime !== null
-            ? new Date(Math.round(output.StartTime * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.StartTime)))
             : undefined,
-        State: (0, smithy_client_1.expectString)(output.State),
-        UsagePrice: (0, smithy_client_1.limitedParseDouble)(output.UsagePrice),
+        State: smithy_client_1.expectString(output.State),
+        UsagePrice: smithy_client_1.limitedParseDouble(output.UsagePrice),
     };
 };
 const deserializeAws_restJson1ReservedElasticsearchInstanceList = (output, context) => {
@@ -5443,16 +5447,16 @@ const deserializeAws_restJson1ReservedElasticsearchInstanceList = (output, conte
 };
 const deserializeAws_restJson1ReservedElasticsearchInstanceOffering = (output, context) => {
     return {
-        CurrencyCode: (0, smithy_client_1.expectString)(output.CurrencyCode),
-        Duration: (0, smithy_client_1.expectInt32)(output.Duration),
-        ElasticsearchInstanceType: (0, smithy_client_1.expectString)(output.ElasticsearchInstanceType),
-        FixedPrice: (0, smithy_client_1.limitedParseDouble)(output.FixedPrice),
-        PaymentOption: (0, smithy_client_1.expectString)(output.PaymentOption),
+        CurrencyCode: smithy_client_1.expectString(output.CurrencyCode),
+        Duration: smithy_client_1.expectInt32(output.Duration),
+        ElasticsearchInstanceType: smithy_client_1.expectString(output.ElasticsearchInstanceType),
+        FixedPrice: smithy_client_1.limitedParseDouble(output.FixedPrice),
+        PaymentOption: smithy_client_1.expectString(output.PaymentOption),
         RecurringCharges: output.RecurringCharges !== undefined && output.RecurringCharges !== null
             ? deserializeAws_restJson1RecurringChargeList(output.RecurringCharges, context)
             : undefined,
-        ReservedElasticsearchInstanceOfferingId: (0, smithy_client_1.expectString)(output.ReservedElasticsearchInstanceOfferingId),
-        UsagePrice: (0, smithy_client_1.limitedParseDouble)(output.UsagePrice),
+        ReservedElasticsearchInstanceOfferingId: smithy_client_1.expectString(output.ReservedElasticsearchInstanceOfferingId),
+        UsagePrice: smithy_client_1.limitedParseDouble(output.UsagePrice),
     };
 };
 const deserializeAws_restJson1ReservedElasticsearchInstanceOfferingList = (output, context) => {
@@ -5467,46 +5471,48 @@ const deserializeAws_restJson1ReservedElasticsearchInstanceOfferingList = (outpu
 };
 const deserializeAws_restJson1SAMLIdp = (output, context) => {
     return {
-        EntityId: (0, smithy_client_1.expectString)(output.EntityId),
-        MetadataContent: (0, smithy_client_1.expectString)(output.MetadataContent),
+        EntityId: smithy_client_1.expectString(output.EntityId),
+        MetadataContent: smithy_client_1.expectString(output.MetadataContent),
     };
 };
 const deserializeAws_restJson1SAMLOptionsOutput = (output, context) => {
     return {
-        Enabled: (0, smithy_client_1.expectBoolean)(output.Enabled),
+        Enabled: smithy_client_1.expectBoolean(output.Enabled),
         Idp: output.Idp !== undefined && output.Idp !== null
             ? deserializeAws_restJson1SAMLIdp(output.Idp, context)
             : undefined,
-        RolesKey: (0, smithy_client_1.expectString)(output.RolesKey),
-        SessionTimeoutMinutes: (0, smithy_client_1.expectInt32)(output.SessionTimeoutMinutes),
-        SubjectKey: (0, smithy_client_1.expectString)(output.SubjectKey),
+        RolesKey: smithy_client_1.expectString(output.RolesKey),
+        SessionTimeoutMinutes: smithy_client_1.expectInt32(output.SessionTimeoutMinutes),
+        SubjectKey: smithy_client_1.expectString(output.SubjectKey),
     };
 };
 const deserializeAws_restJson1ScheduledAutoTuneDetails = (output, context) => {
     return {
-        Action: (0, smithy_client_1.expectString)(output.Action),
-        ActionType: (0, smithy_client_1.expectString)(output.ActionType),
-        Date: output.Date !== undefined && output.Date !== null ? new Date(Math.round(output.Date * 1000)) : undefined,
-        Severity: (0, smithy_client_1.expectString)(output.Severity),
+        Action: smithy_client_1.expectString(output.Action),
+        ActionType: smithy_client_1.expectString(output.ActionType),
+        Date: output.Date !== undefined && output.Date !== null
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.Date)))
+            : undefined,
+        Severity: smithy_client_1.expectString(output.Severity),
     };
 };
 const deserializeAws_restJson1ServiceSoftwareOptions = (output, context) => {
     return {
         AutomatedUpdateDate: output.AutomatedUpdateDate !== undefined && output.AutomatedUpdateDate !== null
-            ? new Date(Math.round(output.AutomatedUpdateDate * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.AutomatedUpdateDate)))
             : undefined,
-        Cancellable: (0, smithy_client_1.expectBoolean)(output.Cancellable),
-        CurrentVersion: (0, smithy_client_1.expectString)(output.CurrentVersion),
-        Description: (0, smithy_client_1.expectString)(output.Description),
-        NewVersion: (0, smithy_client_1.expectString)(output.NewVersion),
-        OptionalDeployment: (0, smithy_client_1.expectBoolean)(output.OptionalDeployment),
-        UpdateAvailable: (0, smithy_client_1.expectBoolean)(output.UpdateAvailable),
-        UpdateStatus: (0, smithy_client_1.expectString)(output.UpdateStatus),
+        Cancellable: smithy_client_1.expectBoolean(output.Cancellable),
+        CurrentVersion: smithy_client_1.expectString(output.CurrentVersion),
+        Description: smithy_client_1.expectString(output.Description),
+        NewVersion: smithy_client_1.expectString(output.NewVersion),
+        OptionalDeployment: smithy_client_1.expectBoolean(output.OptionalDeployment),
+        UpdateAvailable: smithy_client_1.expectBoolean(output.UpdateAvailable),
+        UpdateStatus: smithy_client_1.expectString(output.UpdateStatus),
     };
 };
 const deserializeAws_restJson1SnapshotOptions = (output, context) => {
     return {
-        AutomatedSnapshotStartHour: (0, smithy_client_1.expectInt32)(output.AutomatedSnapshotStartHour),
+        AutomatedSnapshotStartHour: smithy_client_1.expectInt32(output.AutomatedSnapshotStartHour),
     };
 };
 const deserializeAws_restJson1SnapshotOptionsStatus = (output, context) => {
@@ -5521,16 +5527,16 @@ const deserializeAws_restJson1SnapshotOptionsStatus = (output, context) => {
 };
 const deserializeAws_restJson1StorageType = (output, context) => {
     return {
-        StorageSubTypeName: (0, smithy_client_1.expectString)(output.StorageSubTypeName),
+        StorageSubTypeName: smithy_client_1.expectString(output.StorageSubTypeName),
         StorageTypeLimits: output.StorageTypeLimits !== undefined && output.StorageTypeLimits !== null
             ? deserializeAws_restJson1StorageTypeLimitList(output.StorageTypeLimits, context)
             : undefined,
-        StorageTypeName: (0, smithy_client_1.expectString)(output.StorageTypeName),
+        StorageTypeName: smithy_client_1.expectString(output.StorageTypeName),
     };
 };
 const deserializeAws_restJson1StorageTypeLimit = (output, context) => {
     return {
-        LimitName: (0, smithy_client_1.expectString)(output.LimitName),
+        LimitName: smithy_client_1.expectString(output.LimitName),
         LimitValues: output.LimitValues !== undefined && output.LimitValues !== null
             ? deserializeAws_restJson1LimitValueList(output.LimitValues, context)
             : undefined,
@@ -5563,13 +5569,13 @@ const deserializeAws_restJson1StringList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_restJson1Tag = (output, context) => {
     return {
-        Key: (0, smithy_client_1.expectString)(output.Key),
-        Value: (0, smithy_client_1.expectString)(output.Value),
+        Key: smithy_client_1.expectString(output.Key),
+        Value: smithy_client_1.expectString(output.Value),
     };
 };
 const deserializeAws_restJson1TagList = (output, context) => {
@@ -5585,13 +5591,13 @@ const deserializeAws_restJson1TagList = (output, context) => {
 const deserializeAws_restJson1UpgradeHistory = (output, context) => {
     return {
         StartTimestamp: output.StartTimestamp !== undefined && output.StartTimestamp !== null
-            ? new Date(Math.round(output.StartTimestamp * 1000))
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseEpochTimestamp(smithy_client_1.expectNumber(output.StartTimestamp)))
             : undefined,
         StepsList: output.StepsList !== undefined && output.StepsList !== null
             ? deserializeAws_restJson1UpgradeStepsList(output.StepsList, context)
             : undefined,
-        UpgradeName: (0, smithy_client_1.expectString)(output.UpgradeName),
-        UpgradeStatus: (0, smithy_client_1.expectString)(output.UpgradeStatus),
+        UpgradeName: smithy_client_1.expectString(output.UpgradeName),
+        UpgradeStatus: smithy_client_1.expectString(output.UpgradeStatus),
     };
 };
 const deserializeAws_restJson1UpgradeHistoryList = (output, context) => {
@@ -5609,9 +5615,9 @@ const deserializeAws_restJson1UpgradeStepItem = (output, context) => {
         Issues: output.Issues !== undefined && output.Issues !== null
             ? deserializeAws_restJson1Issues(output.Issues, context)
             : undefined,
-        ProgressPercent: (0, smithy_client_1.limitedParseDouble)(output.ProgressPercent),
-        UpgradeStep: (0, smithy_client_1.expectString)(output.UpgradeStep),
-        UpgradeStepStatus: (0, smithy_client_1.expectString)(output.UpgradeStepStatus),
+        ProgressPercent: smithy_client_1.limitedParseDouble(output.ProgressPercent),
+        UpgradeStep: smithy_client_1.expectString(output.UpgradeStep),
+        UpgradeStepStatus: smithy_client_1.expectString(output.UpgradeStepStatus),
     };
 };
 const deserializeAws_restJson1UpgradeStepsList = (output, context) => {
@@ -5635,7 +5641,7 @@ const deserializeAws_restJson1VPCDerivedInfo = (output, context) => {
         SubnetIds: output.SubnetIds !== undefined && output.SubnetIds !== null
             ? deserializeAws_restJson1StringList(output.SubnetIds, context)
             : undefined,
-        VPCId: (0, smithy_client_1.expectString)(output.VPCId),
+        VPCId: smithy_client_1.expectString(output.VPCId),
     };
 };
 const deserializeAws_restJson1VPCDerivedInfoStatus = (output, context) => {
@@ -5650,7 +5656,7 @@ const deserializeAws_restJson1VPCDerivedInfoStatus = (output, context) => {
 };
 const deserializeAws_restJson1ZoneAwarenessConfig = (output, context) => {
     return {
-        AvailabilityZoneCount: (0, smithy_client_1.expectInt32)(output.AvailabilityZoneCount),
+        AvailabilityZoneCount: smithy_client_1.expectInt32(output.AvailabilityZoneCount),
     };
 };
 const deserializeMetadata = (output) => {