@aws-sdk/client-dataexchange 3.141.0 → 3.150.0

package/dist-cjs/protocols/Aws_restJson1.js

@@ -10,16 +10,7 @@ const serializeAws_restJson1CancelJobCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/jobs/{JobId}";
-    if (input.JobId !== undefined) {
-        const labelValue = input.JobId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: JobId.");
-        }
-        resolvedPath = resolvedPath.replace("{JobId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: JobId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "JobId", () => input.JobId, "{JobId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -106,16 +97,7 @@ const serializeAws_restJson1CreateRevisionCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/data-sets/{DataSetId}/revisions";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Comment != null && { Comment: input.Comment }),
@@ -137,36 +119,9 @@ const serializeAws_restJson1DeleteAssetCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}";
-    if (input.AssetId !== undefined) {
-        const labelValue = input.AssetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: AssetId.");
-        }
-        resolvedPath = resolvedPath.replace("{AssetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: AssetId.");
-    }
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    if (input.RevisionId !== undefined) {
-        const labelValue = input.RevisionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: RevisionId.");
-        }
-        resolvedPath = resolvedPath.replace("{RevisionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: RevisionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "AssetId", () => input.AssetId, "{AssetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "RevisionId", () => input.RevisionId, "{RevisionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -183,16 +138,7 @@ const serializeAws_restJson1DeleteDataSetCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/data-sets/{DataSetId}";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -209,16 +155,7 @@ const serializeAws_restJson1DeleteEventActionCommand = async (input, context) =>
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/event-actions/{EventActionId}";
-    if (input.EventActionId !== undefined) {
-        const labelValue = input.EventActionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: EventActionId.");
-        }
-        resolvedPath = resolvedPath.replace("{EventActionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: EventActionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "EventActionId", () => input.EventActionId, "{EventActionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -236,26 +173,8 @@ const serializeAws_restJson1DeleteRevisionCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/v1/data-sets/{DataSetId}/revisions/{RevisionId}";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    if (input.RevisionId !== undefined) {
-        const labelValue = input.RevisionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: RevisionId.");
-        }
-        resolvedPath = resolvedPath.replace("{RevisionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: RevisionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "RevisionId", () => input.RevisionId, "{RevisionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -273,36 +192,9 @@ const serializeAws_restJson1GetAssetCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}";
-    if (input.AssetId !== undefined) {
-        const labelValue = input.AssetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: AssetId.");
-        }
-        resolvedPath = resolvedPath.replace("{AssetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: AssetId.");
-    }
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    if (input.RevisionId !== undefined) {
-        const labelValue = input.RevisionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: RevisionId.");
-        }
-        resolvedPath = resolvedPath.replace("{RevisionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: RevisionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "AssetId", () => input.AssetId, "{AssetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "RevisionId", () => input.RevisionId, "{RevisionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -319,16 +211,7 @@ const serializeAws_restJson1GetDataSetCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/data-sets/{DataSetId}";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -345,16 +228,7 @@ const serializeAws_restJson1GetEventActionCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/event-actions/{EventActionId}";
-    if (input.EventActionId !== undefined) {
-        const labelValue = input.EventActionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: EventActionId.");
-        }
-        resolvedPath = resolvedPath.replace("{EventActionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: EventActionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "EventActionId", () => input.EventActionId, "{EventActionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -371,16 +245,7 @@ const serializeAws_restJson1GetJobCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/jobs/{JobId}";
-    if (input.JobId !== undefined) {
-        const labelValue = input.JobId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: JobId.");
-        }
-        resolvedPath = resolvedPath.replace("{JobId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: JobId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "JobId", () => input.JobId, "{JobId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -398,26 +263,8 @@ const serializeAws_restJson1GetRevisionCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/v1/data-sets/{DataSetId}/revisions/{RevisionId}";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    if (input.RevisionId !== undefined) {
-        const labelValue = input.RevisionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: RevisionId.");
-        }
-        resolvedPath = resolvedPath.replace("{RevisionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: RevisionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "RevisionId", () => input.RevisionId, "{RevisionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -434,20 +281,11 @@ const serializeAws_restJson1ListDataSetRevisionsCommand = async (input, context)
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/data-sets/{DataSetId}/revisions";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -465,11 +303,11 @@ const serializeAws_restJson1ListDataSetsCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/data-sets";
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-        ...(input.Origin !== undefined && { origin: input.Origin }),
-    };
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+        origin: [, input.Origin],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -487,11 +325,11 @@ const serializeAws_restJson1ListEventActionsCommand = async (input, context) =>
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/event-actions";
-    const query = {
-        ...(input.EventSourceId !== undefined && { eventSourceId: input.EventSourceId }),
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    const query = map({
+        eventSourceId: [, input.EventSourceId],
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -509,12 +347,12 @@ const serializeAws_restJson1ListJobsCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/jobs";
-    const query = {
-        ...(input.DataSetId !== undefined && { dataSetId: input.DataSetId }),
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-        ...(input.RevisionId !== undefined && { revisionId: input.RevisionId }),
-    };
+    const query = map({
+        dataSetId: [, input.DataSetId],
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+        revisionId: [, input.RevisionId],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -533,30 +371,12 @@ const serializeAws_restJson1ListRevisionAssetsCommand = async (input, context) =
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    if (input.RevisionId !== undefined) {
-        const labelValue = input.RevisionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: RevisionId.");
-        }
-        resolvedPath = resolvedPath.replace("{RevisionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: RevisionId.");
-    }
-    const query = {
-        ...(input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() }),
-        ...(input.NextToken !== undefined && { nextToken: input.NextToken }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "RevisionId", () => input.RevisionId, "{RevisionId}", false);
+    const query = map({
+        maxResults: [() => input.MaxResults !== void 0, () => input.MaxResults.toString()],
+        nextToken: [, input.NextToken],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -574,16 +394,7 @@ const serializeAws_restJson1ListTagsForResourceCommand = async (input, context)
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{ResourceArn}";
-    if (input.ResourceArn !== undefined) {
-        const labelValue = input.ResourceArn;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-        }
-        resolvedPath = resolvedPath.replace("{ResourceArn}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: ResourceArn.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ResourceArn", () => input.ResourceArn, "{ResourceArn}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -603,26 +414,8 @@ const serializeAws_restJson1RevokeRevisionCommand = async (input, context) => {
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/revoke";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    if (input.RevisionId !== undefined) {
-        const labelValue = input.RevisionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: RevisionId.");
-        }
-        resolvedPath = resolvedPath.replace("{RevisionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: RevisionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "RevisionId", () => input.RevisionId, "{RevisionId}", false);
     let body;
     body = JSON.stringify({
         ...(input.RevocationComment != null && { RevocationComment: input.RevocationComment }),
@@ -640,23 +433,23 @@ const serializeAws_restJson1RevokeRevisionCommand = async (input, context) => {
 exports.serializeAws_restJson1RevokeRevisionCommand = serializeAws_restJson1RevokeRevisionCommand;
 const serializeAws_restJson1SendApiAssetCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
-    const headers = {
+    const headers = map({}, isSerializableHeaderValue, {
         "content-type": "text/plain",
-        ...(isSerializableHeaderValue(input.AssetId) && { "x-amzn-dataexchange-asset-id": input.AssetId }),
-        ...(isSerializableHeaderValue(input.DataSetId) && { "x-amzn-dataexchange-data-set-id": input.DataSetId }),
-        ...(isSerializableHeaderValue(input.Method) && { "x-amzn-dataexchange-http-method": input.Method }),
-        ...(isSerializableHeaderValue(input.Path) && { "x-amzn-dataexchange-path": input.Path }),
-        ...(isSerializableHeaderValue(input.RevisionId) && { "x-amzn-dataexchange-revision-id": input.RevisionId }),
+        "x-amzn-dataexchange-asset-id": input.AssetId,
+        "x-amzn-dataexchange-data-set-id": input.DataSetId,
+        "x-amzn-dataexchange-http-method": input.Method,
+        "x-amzn-dataexchange-path": input.Path,
+        "x-amzn-dataexchange-revision-id": input.RevisionId,
         ...(input.RequestHeaders !== undefined &&
             Object.keys(input.RequestHeaders).reduce((acc, suffix) => ({
                 ...acc,
                 [`x-amzn-dataexchange-header-${suffix.toLowerCase()}`]: input.RequestHeaders[suffix],
             }), {})),
-    };
+    });
     const resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1";
-    const query = {
-        ...(input.QueryStringParameters !== undefined && input.QueryStringParameters),
-    };
+    const query = map({
+        ...(0, smithy_client_1.convertMap)(input.QueryStringParameters),
+    });
     let body;
     if (input.Body !== undefined) {
         body = input.Body;
@@ -684,16 +477,7 @@ const serializeAws_restJson1StartJobCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/jobs/{JobId}";
-    if (input.JobId !== undefined) {
-        const labelValue = input.JobId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: JobId.");
-        }
-        resolvedPath = resolvedPath.replace("{JobId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: JobId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "JobId", () => input.JobId, "{JobId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -712,16 +496,7 @@ const serializeAws_restJson1TagResourceCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{ResourceArn}";
-    if (input.ResourceArn !== undefined) {
-        const labelValue = input.ResourceArn;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-        }
-        resolvedPath = resolvedPath.replace("{ResourceArn}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: ResourceArn.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ResourceArn", () => input.ResourceArn, "{ResourceArn}", false);
     let body;
     body = JSON.stringify({
         ...(input.Tags != null && { tags: serializeAws_restJson1MapOf__string(input.Tags, context) }),
@@ -741,19 +516,10 @@ const serializeAws_restJson1UntagResourceCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/tags/{ResourceArn}";
-    if (input.ResourceArn !== undefined) {
-        const labelValue = input.ResourceArn;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-        }
-        resolvedPath = resolvedPath.replace("{ResourceArn}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: ResourceArn.");
-    }
-    const query = {
-        ...(input.TagKeys !== undefined && { tagKeys: (input.TagKeys || []).map((_entry) => _entry) }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "ResourceArn", () => input.ResourceArn, "{ResourceArn}", false);
+    const query = map({
+        tagKeys: [() => input.TagKeys !== void 0, () => (input.TagKeys || []).map((_entry) => _entry)],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -774,36 +540,9 @@ const serializeAws_restJson1UpdateAssetCommand = async (input, context) => {
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}";
-    if (input.AssetId !== undefined) {
-        const labelValue = input.AssetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: AssetId.");
-        }
-        resolvedPath = resolvedPath.replace("{AssetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: AssetId.");
-    }
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    if (input.RevisionId !== undefined) {
-        const labelValue = input.RevisionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: RevisionId.");
-        }
-        resolvedPath = resolvedPath.replace("{RevisionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: RevisionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "AssetId", () => input.AssetId, "{AssetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "RevisionId", () => input.RevisionId, "{RevisionId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Name != null && { Name: input.Name }),
@@ -825,16 +564,7 @@ const serializeAws_restJson1UpdateDataSetCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/data-sets/{DataSetId}";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Description != null && { Description: input.Description }),
@@ -857,16 +587,7 @@ const serializeAws_restJson1UpdateEventActionCommand = async (input, context) =>
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/v1/event-actions/{EventActionId}";
-    if (input.EventActionId !== undefined) {
-        const labelValue = input.EventActionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: EventActionId.");
-        }
-        resolvedPath = resolvedPath.replace("{EventActionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: EventActionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "EventActionId", () => input.EventActionId, "{EventActionId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Action != null && { Action: serializeAws_restJson1Action(input.Action, context) }),
@@ -889,26 +610,8 @@ const serializeAws_restJson1UpdateRevisionCommand = async (input, context) => {
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/v1/data-sets/{DataSetId}/revisions/{RevisionId}";
-    if (input.DataSetId !== undefined) {
-        const labelValue = input.DataSetId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: DataSetId.");
-        }
-        resolvedPath = resolvedPath.replace("{DataSetId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: DataSetId.");
-    }
-    if (input.RevisionId !== undefined) {
-        const labelValue = input.RevisionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: RevisionId.");
-        }
-        resolvedPath = resolvedPath.replace("{RevisionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: RevisionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "DataSetId", () => input.DataSetId, "{DataSetId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "RevisionId", () => input.RevisionId, "{RevisionId}", false);
     let body;
     body = JSON.stringify({
         ...(input.Comment != null && { Comment: input.Comment }),
@@ -929,11 +632,11 @@ const deserializeAws_restJson1CancelJobCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1CancelJobCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CancelJobCommand = deserializeAws_restJson1CancelJobCommand;
 const deserializeAws_restJson1CancelJobCommandError = async (output, context) => {
@@ -941,7 +644,6 @@ const deserializeAws_restJson1CancelJobCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "ConflictException":
@@ -961,69 +663,56 @@ const deserializeAws_restJson1CancelJobCommandError = async (output, context) =>
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateDataSetCommand = async (output, context) => {
     if (output.statusCode !== 201 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateDataSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        AssetType: undefined,
-        CreatedAt: undefined,
-        Description: undefined,
-        Id: undefined,
-        Name: undefined,
-        Origin: undefined,
-        OriginDetails: undefined,
-        SourceId: undefined,
-        Tags: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.AssetType !== undefined && data.AssetType !== null) {
+    if (data.AssetType != null) {
         contents.AssetType = (0, smithy_client_1.expectString)(data.AssetType);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.Description !== undefined && data.Description !== null) {
+    if (data.Description != null) {
         contents.Description = (0, smithy_client_1.expectString)(data.Description);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.Name !== undefined && data.Name !== null) {
+    if (data.Name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.Name);
     }
-    if (data.Origin !== undefined && data.Origin !== null) {
+    if (data.Origin != null) {
         contents.Origin = (0, smithy_client_1.expectString)(data.Origin);
     }
-    if (data.OriginDetails !== undefined && data.OriginDetails !== null) {
+    if (data.OriginDetails != null) {
         contents.OriginDetails = deserializeAws_restJson1OriginDetails(data.OriginDetails, context);
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.Tags !== undefined && data.Tags !== null) {
+    if (data.Tags != null) {
         contents.Tags = deserializeAws_restJson1MapOf__string(data.Tags, context);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateDataSetCommand = deserializeAws_restJson1CreateDataSetCommand;
 const deserializeAws_restJson1CreateDataSetCommandError = async (output, context) => {
@@ -1031,7 +720,6 @@ const deserializeAws_restJson1CreateDataSetCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1051,49 +739,41 @@ const deserializeAws_restJson1CreateDataSetCommandError = async (output, context
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateEventActionCommand = async (output, context) => {
     if (output.statusCode !== 201 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateEventActionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Action: undefined,
-        Arn: undefined,
-        CreatedAt: undefined,
-        Event: undefined,
-        Id: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Action !== undefined && data.Action !== null) {
+    if (data.Action != null) {
         contents.Action = deserializeAws_restJson1Action(data.Action, context);
     }
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.Event !== undefined && data.Event !== null) {
+    if (data.Event != null) {
         contents.Event = deserializeAws_restJson1Event(data.Event, context);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateEventActionCommand = deserializeAws_restJson1CreateEventActionCommand;
 const deserializeAws_restJson1CreateEventActionCommandError = async (output, context) => {
@@ -1101,7 +781,6 @@ const deserializeAws_restJson1CreateEventActionCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1121,57 +800,47 @@ const deserializeAws_restJson1CreateEventActionCommandError = async (output, con
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateJobCommand = async (output, context) => {
     if (output.statusCode !== 201 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateJobCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        CreatedAt: undefined,
-        Details: undefined,
-        Errors: undefined,
-        Id: undefined,
-        State: undefined,
-        Type: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.Details !== undefined && data.Details !== null) {
+    if (data.Details != null) {
         contents.Details = deserializeAws_restJson1ResponseDetails(data.Details, context);
     }
-    if (data.Errors !== undefined && data.Errors !== null) {
+    if (data.Errors != null) {
         contents.Errors = deserializeAws_restJson1ListOfJobError(data.Errors, context);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.State !== undefined && data.State !== null) {
+    if (data.State != null) {
         contents.State = (0, smithy_client_1.expectString)(data.State);
     }
-    if (data.Type !== undefined && data.Type !== null) {
+    if (data.Type != null) {
         contents.Type = (0, smithy_client_1.expectString)(data.Type);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateJobCommand = deserializeAws_restJson1CreateJobCommand;
 const deserializeAws_restJson1CreateJobCommandError = async (output, context) => {
@@ -1179,7 +848,6 @@ const deserializeAws_restJson1CreateJobCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1202,73 +870,59 @@ const deserializeAws_restJson1CreateJobCommandError = async (output, context) =>
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateRevisionCommand = async (output, context) => {
     if (output.statusCode !== 201 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateRevisionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        Comment: undefined,
-        CreatedAt: undefined,
-        DataSetId: undefined,
-        Finalized: undefined,
-        Id: undefined,
-        RevocationComment: undefined,
-        Revoked: undefined,
-        RevokedAt: undefined,
-        SourceId: undefined,
-        Tags: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.Comment !== undefined && data.Comment !== null) {
+    if (data.Comment != null) {
         contents.Comment = (0, smithy_client_1.expectString)(data.Comment);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.DataSetId !== undefined && data.DataSetId !== null) {
+    if (data.DataSetId != null) {
         contents.DataSetId = (0, smithy_client_1.expectString)(data.DataSetId);
     }
-    if (data.Finalized !== undefined && data.Finalized !== null) {
+    if (data.Finalized != null) {
         contents.Finalized = (0, smithy_client_1.expectBoolean)(data.Finalized);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.RevocationComment !== undefined && data.RevocationComment !== null) {
+    if (data.RevocationComment != null) {
         contents.RevocationComment = (0, smithy_client_1.expectString)(data.RevocationComment);
     }
-    if (data.Revoked !== undefined && data.Revoked !== null) {
+    if (data.Revoked != null) {
         contents.Revoked = (0, smithy_client_1.expectBoolean)(data.Revoked);
     }
-    if (data.RevokedAt !== undefined && data.RevokedAt !== null) {
+    if (data.RevokedAt != null) {
         contents.RevokedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.RevokedAt));
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.Tags !== undefined && data.Tags !== null) {
+    if (data.Tags != null) {
         contents.Tags = deserializeAws_restJson1MapOf__string(data.Tags, context);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateRevisionCommand = deserializeAws_restJson1CreateRevisionCommand;
 const deserializeAws_restJson1CreateRevisionCommandError = async (output, context) => {
@@ -1276,7 +930,6 @@ const deserializeAws_restJson1CreateRevisionCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1296,25 +949,23 @@ const deserializeAws_restJson1CreateRevisionCommandError = async (output, contex
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteAssetCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteAssetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteAssetCommand = deserializeAws_restJson1DeleteAssetCommand;
 const deserializeAws_restJson1DeleteAssetCommandError = async (output, context) => {
@@ -1322,7 +973,6 @@ const deserializeAws_restJson1DeleteAssetCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1345,25 +995,23 @@ const deserializeAws_restJson1DeleteAssetCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteDataSetCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteDataSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteDataSetCommand = deserializeAws_restJson1DeleteDataSetCommand;
 const deserializeAws_restJson1DeleteDataSetCommandError = async (output, context) => {
@@ -1371,7 +1019,6 @@ const deserializeAws_restJson1DeleteDataSetCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1394,25 +1041,23 @@ const deserializeAws_restJson1DeleteDataSetCommandError = async (output, context
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteEventActionCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteEventActionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteEventActionCommand = deserializeAws_restJson1DeleteEventActionCommand;
 const deserializeAws_restJson1DeleteEventActionCommandError = async (output, context) => {
@@ -1420,7 +1065,6 @@ const deserializeAws_restJson1DeleteEventActionCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1437,25 +1081,23 @@ const deserializeAws_restJson1DeleteEventActionCommandError = async (output, con
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteRevisionCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteRevisionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteRevisionCommand = deserializeAws_restJson1DeleteRevisionCommand;
 const deserializeAws_restJson1DeleteRevisionCommandError = async (output, context) => {
@@ -1463,7 +1105,6 @@ const deserializeAws_restJson1DeleteRevisionCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1486,65 +1127,53 @@ const deserializeAws_restJson1DeleteRevisionCommandError = async (output, contex
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetAssetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetAssetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        AssetDetails: undefined,
-        AssetType: undefined,
-        CreatedAt: undefined,
-        DataSetId: undefined,
-        Id: undefined,
-        Name: undefined,
-        RevisionId: undefined,
-        SourceId: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.AssetDetails !== undefined && data.AssetDetails !== null) {
+    if (data.AssetDetails != null) {
         contents.AssetDetails = deserializeAws_restJson1AssetDetails(data.AssetDetails, context);
     }
-    if (data.AssetType !== undefined && data.AssetType !== null) {
+    if (data.AssetType != null) {
         contents.AssetType = (0, smithy_client_1.expectString)(data.AssetType);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.DataSetId !== undefined && data.DataSetId !== null) {
+    if (data.DataSetId != null) {
         contents.DataSetId = (0, smithy_client_1.expectString)(data.DataSetId);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.Name !== undefined && data.Name !== null) {
+    if (data.Name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.Name);
     }
-    if (data.RevisionId !== undefined && data.RevisionId !== null) {
+    if (data.RevisionId != null) {
         contents.RevisionId = (0, smithy_client_1.expectString)(data.RevisionId);
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetAssetCommand = deserializeAws_restJson1GetAssetCommand;
 const deserializeAws_restJson1GetAssetCommandError = async (output, context) => {
@@ -1552,7 +1181,6 @@ const deserializeAws_restJson1GetAssetCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1569,69 +1197,56 @@ const deserializeAws_restJson1GetAssetCommandError = async (output, context) =>
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetDataSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetDataSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        AssetType: undefined,
-        CreatedAt: undefined,
-        Description: undefined,
-        Id: undefined,
-        Name: undefined,
-        Origin: undefined,
-        OriginDetails: undefined,
-        SourceId: undefined,
-        Tags: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.AssetType !== undefined && data.AssetType !== null) {
+    if (data.AssetType != null) {
         contents.AssetType = (0, smithy_client_1.expectString)(data.AssetType);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.Description !== undefined && data.Description !== null) {
+    if (data.Description != null) {
         contents.Description = (0, smithy_client_1.expectString)(data.Description);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.Name !== undefined && data.Name !== null) {
+    if (data.Name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.Name);
     }
-    if (data.Origin !== undefined && data.Origin !== null) {
+    if (data.Origin != null) {
         contents.Origin = (0, smithy_client_1.expectString)(data.Origin);
     }
-    if (data.OriginDetails !== undefined && data.OriginDetails !== null) {
+    if (data.OriginDetails != null) {
         contents.OriginDetails = deserializeAws_restJson1OriginDetails(data.OriginDetails, context);
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.Tags !== undefined && data.Tags !== null) {
+    if (data.Tags != null) {
         contents.Tags = deserializeAws_restJson1MapOf__string(data.Tags, context);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetDataSetCommand = deserializeAws_restJson1GetDataSetCommand;
 const deserializeAws_restJson1GetDataSetCommandError = async (output, context) => {
@@ -1639,7 +1254,6 @@ const deserializeAws_restJson1GetDataSetCommandError = async (output, context) =
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1656,49 +1270,41 @@ const deserializeAws_restJson1GetDataSetCommandError = async (output, context) =
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetEventActionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetEventActionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Action: undefined,
-        Arn: undefined,
-        CreatedAt: undefined,
-        Event: undefined,
-        Id: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Action !== undefined && data.Action !== null) {
+    if (data.Action != null) {
         contents.Action = deserializeAws_restJson1Action(data.Action, context);
     }
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.Event !== undefined && data.Event !== null) {
+    if (data.Event != null) {
         contents.Event = deserializeAws_restJson1Event(data.Event, context);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetEventActionCommand = deserializeAws_restJson1GetEventActionCommand;
 const deserializeAws_restJson1GetEventActionCommandError = async (output, context) => {
@@ -1706,7 +1312,6 @@ const deserializeAws_restJson1GetEventActionCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1723,57 +1328,47 @@ const deserializeAws_restJson1GetEventActionCommandError = async (output, contex
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetJobCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetJobCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        CreatedAt: undefined,
-        Details: undefined,
-        Errors: undefined,
-        Id: undefined,
-        State: undefined,
-        Type: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.Details !== undefined && data.Details !== null) {
+    if (data.Details != null) {
         contents.Details = deserializeAws_restJson1ResponseDetails(data.Details, context);
     }
-    if (data.Errors !== undefined && data.Errors !== null) {
+    if (data.Errors != null) {
         contents.Errors = deserializeAws_restJson1ListOfJobError(data.Errors, context);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.State !== undefined && data.State !== null) {
+    if (data.State != null) {
         contents.State = (0, smithy_client_1.expectString)(data.State);
     }
-    if (data.Type !== undefined && data.Type !== null) {
+    if (data.Type != null) {
         contents.Type = (0, smithy_client_1.expectString)(data.Type);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetJobCommand = deserializeAws_restJson1GetJobCommand;
 const deserializeAws_restJson1GetJobCommandError = async (output, context) => {
@@ -1781,7 +1376,6 @@ const deserializeAws_restJson1GetJobCommandError = async (output, context) => {
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1798,73 +1392,59 @@ const deserializeAws_restJson1GetJobCommandError = async (output, context) => {
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetRevisionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetRevisionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        Comment: undefined,
-        CreatedAt: undefined,
-        DataSetId: undefined,
-        Finalized: undefined,
-        Id: undefined,
-        RevocationComment: undefined,
-        Revoked: undefined,
-        RevokedAt: undefined,
-        SourceId: undefined,
-        Tags: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.Comment !== undefined && data.Comment !== null) {
+    if (data.Comment != null) {
         contents.Comment = (0, smithy_client_1.expectString)(data.Comment);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.DataSetId !== undefined && data.DataSetId !== null) {
+    if (data.DataSetId != null) {
         contents.DataSetId = (0, smithy_client_1.expectString)(data.DataSetId);
     }
-    if (data.Finalized !== undefined && data.Finalized !== null) {
+    if (data.Finalized != null) {
         contents.Finalized = (0, smithy_client_1.expectBoolean)(data.Finalized);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.RevocationComment !== undefined && data.RevocationComment !== null) {
+    if (data.RevocationComment != null) {
         contents.RevocationComment = (0, smithy_client_1.expectString)(data.RevocationComment);
     }
-    if (data.Revoked !== undefined && data.Revoked !== null) {
+    if (data.Revoked != null) {
         contents.Revoked = (0, smithy_client_1.expectBoolean)(data.Revoked);
     }
-    if (data.RevokedAt !== undefined && data.RevokedAt !== null) {
+    if (data.RevokedAt != null) {
         contents.RevokedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.RevokedAt));
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.Tags !== undefined && data.Tags !== null) {
+    if (data.Tags != null) {
         contents.Tags = deserializeAws_restJson1MapOf__string(data.Tags, context);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetRevisionCommand = deserializeAws_restJson1GetRevisionCommand;
 const deserializeAws_restJson1GetRevisionCommandError = async (output, context) => {
@@ -1872,7 +1452,6 @@ const deserializeAws_restJson1GetRevisionCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1889,33 +1468,29 @@ const deserializeAws_restJson1GetRevisionCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListDataSetRevisionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListDataSetRevisionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        NextToken: undefined,
-        Revisions: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    if (data.Revisions !== undefined && data.Revisions !== null) {
+    if (data.Revisions != null) {
         contents.Revisions = deserializeAws_restJson1ListOfRevisionEntry(data.Revisions, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListDataSetRevisionsCommand = deserializeAws_restJson1ListDataSetRevisionsCommand;
 const deserializeAws_restJson1ListDataSetRevisionsCommandError = async (output, context) => {
@@ -1923,7 +1498,6 @@ const deserializeAws_restJson1ListDataSetRevisionsCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1940,33 +1514,29 @@ const deserializeAws_restJson1ListDataSetRevisionsCommandError = async (output,
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListDataSetsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListDataSetsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        DataSets: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.DataSets !== undefined && data.DataSets !== null) {
+    if (data.DataSets != null) {
         contents.DataSets = deserializeAws_restJson1ListOfDataSetEntry(data.DataSets, context);
     }
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListDataSetsCommand = deserializeAws_restJson1ListDataSetsCommand;
 const deserializeAws_restJson1ListDataSetsCommandError = async (output, context) => {
@@ -1974,7 +1544,6 @@ const deserializeAws_restJson1ListDataSetsCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -1991,33 +1560,29 @@ const deserializeAws_restJson1ListDataSetsCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListEventActionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListEventActionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        EventActions: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.EventActions !== undefined && data.EventActions !== null) {
+    if (data.EventActions != null) {
         contents.EventActions = deserializeAws_restJson1ListOfEventActionEntry(data.EventActions, context);
     }
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListEventActionsCommand = deserializeAws_restJson1ListEventActionsCommand;
 const deserializeAws_restJson1ListEventActionsCommandError = async (output, context) => {
@@ -2025,7 +1590,6 @@ const deserializeAws_restJson1ListEventActionsCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -2042,33 +1606,29 @@ const deserializeAws_restJson1ListEventActionsCommandError = async (output, cont
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListJobsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListJobsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Jobs: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Jobs !== undefined && data.Jobs !== null) {
+    if (data.Jobs != null) {
         contents.Jobs = deserializeAws_restJson1ListOfJobEntry(data.Jobs, context);
     }
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListJobsCommand = deserializeAws_restJson1ListJobsCommand;
 const deserializeAws_restJson1ListJobsCommandError = async (output, context) => {
@@ -2076,7 +1636,6 @@ const deserializeAws_restJson1ListJobsCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -2093,33 +1652,29 @@ const deserializeAws_restJson1ListJobsCommandError = async (output, context) =>
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListRevisionAssetsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListRevisionAssetsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Assets: undefined,
-        NextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Assets !== undefined && data.Assets !== null) {
+    if (data.Assets != null) {
         contents.Assets = deserializeAws_restJson1ListOfAssetEntry(data.Assets, context);
     }
-    if (data.NextToken !== undefined && data.NextToken !== null) {
+    if (data.NextToken != null) {
         contents.NextToken = (0, smithy_client_1.expectString)(data.NextToken);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListRevisionAssetsCommand = deserializeAws_restJson1ListRevisionAssetsCommand;
 const deserializeAws_restJson1ListRevisionAssetsCommandError = async (output, context) => {
@@ -2127,7 +1682,6 @@ const deserializeAws_restJson1ListRevisionAssetsCommandError = async (output, co
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InternalServerException":
@@ -2144,29 +1698,26 @@ const deserializeAws_restJson1ListRevisionAssetsCommandError = async (output, co
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListTagsForResourceCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Tags: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.tags !== undefined && data.tags !== null) {
+    if (data.tags != null) {
         contents.Tags = deserializeAws_restJson1MapOf__string(data.tags, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListTagsForResourceCommand = deserializeAws_restJson1ListTagsForResourceCommand;
 const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, context) => {
@@ -2174,74 +1725,57 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        default:
-            const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
-            });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
-    }
+    const parsedBody = parsedOutput.body;
+    (0, smithy_client_1.throwDefaultError)({
+        output,
+        parsedBody,
+        exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+        errorCode,
+    });
 };
 const deserializeAws_restJson1RevokeRevisionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1RevokeRevisionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        Comment: undefined,
-        CreatedAt: undefined,
-        DataSetId: undefined,
-        Finalized: undefined,
-        Id: undefined,
-        RevocationComment: undefined,
-        Revoked: undefined,
-        RevokedAt: undefined,
-        SourceId: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.Comment !== undefined && data.Comment !== null) {
+    if (data.Comment != null) {
         contents.Comment = (0, smithy_client_1.expectString)(data.Comment);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.DataSetId !== undefined && data.DataSetId !== null) {
+    if (data.DataSetId != null) {
         contents.DataSetId = (0, smithy_client_1.expectString)(data.DataSetId);
     }
-    if (data.Finalized !== undefined && data.Finalized !== null) {
+    if (data.Finalized != null) {
         contents.Finalized = (0, smithy_client_1.expectBoolean)(data.Finalized);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.RevocationComment !== undefined && data.RevocationComment !== null) {
+    if (data.RevocationComment != null) {
         contents.RevocationComment = (0, smithy_client_1.expectString)(data.RevocationComment);
     }
-    if (data.Revoked !== undefined && data.Revoked !== null) {
+    if (data.Revoked != null) {
         contents.Revoked = (0, smithy_client_1.expectBoolean)(data.Revoked);
     }
-    if (data.RevokedAt !== undefined && data.RevokedAt !== null) {
+    if (data.RevokedAt != null) {
         contents.RevokedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.RevokedAt));
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1RevokeRevisionCommand = deserializeAws_restJson1RevokeRevisionCommand;
 const deserializeAws_restJson1RevokeRevisionCommandError = async (output, context) => {
@@ -2249,7 +1783,6 @@ const deserializeAws_restJson1RevokeRevisionCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2272,36 +1805,33 @@ const deserializeAws_restJson1RevokeRevisionCommandError = async (output, contex
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1SendApiAssetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1SendApiAssetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Body: undefined,
-        ResponseHeaders: undefined,
-    };
-    Object.keys(output.headers).forEach((header) => {
-        if (contents.ResponseHeaders === undefined) {
-            contents.ResponseHeaders = {};
-        }
-        if (header.startsWith("")) {
-            contents.ResponseHeaders[header.substring(0)] = output.headers[header];
-        }
+        ResponseHeaders: [
+            ,
+            Object.keys(output.headers)
+                .filter((header) => header.startsWith(""))
+                .reduce((acc, header) => {
+                acc[header.substring(0)] = output.headers[header];
+                return acc;
+            }, {}),
+        ],
     });
     const data = await collectBodyString(output.body, context);
     contents.Body = (0, smithy_client_1.expectString)(data);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1SendApiAssetCommand = deserializeAws_restJson1SendApiAssetCommand;
 const deserializeAws_restJson1SendApiAssetCommandError = async (output, context) => {
@@ -2309,7 +1839,6 @@ const deserializeAws_restJson1SendApiAssetCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2329,25 +1858,23 @@ const deserializeAws_restJson1SendApiAssetCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1StartJobCommand = async (output, context) => {
     if (output.statusCode !== 202 && output.statusCode >= 300) {
         return deserializeAws_restJson1StartJobCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1StartJobCommand = deserializeAws_restJson1StartJobCommand;
 const deserializeAws_restJson1StartJobCommandError = async (output, context) => {
@@ -2355,7 +1882,6 @@ const deserializeAws_restJson1StartJobCommandError = async (output, context) =>
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2378,25 +1904,23 @@ const deserializeAws_restJson1StartJobCommandError = async (output, context) =>
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1TagResourceCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1TagResourceCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1TagResourceCommand = deserializeAws_restJson1TagResourceCommand;
 const deserializeAws_restJson1TagResourceCommandError = async (output, context) => {
@@ -2404,30 +1928,24 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        default:
-            const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
-            });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
-    }
+    const parsedBody = parsedOutput.body;
+    (0, smithy_client_1.throwDefaultError)({
+        output,
+        parsedBody,
+        exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+        errorCode,
+    });
 };
 const deserializeAws_restJson1UntagResourceCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
         return deserializeAws_restJson1UntagResourceCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UntagResourceCommand = deserializeAws_restJson1UntagResourceCommand;
 const deserializeAws_restJson1UntagResourceCommandError = async (output, context) => {
@@ -2435,70 +1953,54 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        default:
-            const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
-            });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
-    }
+    const parsedBody = parsedOutput.body;
+    (0, smithy_client_1.throwDefaultError)({
+        output,
+        parsedBody,
+        exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+        errorCode,
+    });
 };
 const deserializeAws_restJson1UpdateAssetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateAssetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        AssetDetails: undefined,
-        AssetType: undefined,
-        CreatedAt: undefined,
-        DataSetId: undefined,
-        Id: undefined,
-        Name: undefined,
-        RevisionId: undefined,
-        SourceId: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.AssetDetails !== undefined && data.AssetDetails !== null) {
+    if (data.AssetDetails != null) {
         contents.AssetDetails = deserializeAws_restJson1AssetDetails(data.AssetDetails, context);
     }
-    if (data.AssetType !== undefined && data.AssetType !== null) {
+    if (data.AssetType != null) {
         contents.AssetType = (0, smithy_client_1.expectString)(data.AssetType);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.DataSetId !== undefined && data.DataSetId !== null) {
+    if (data.DataSetId != null) {
         contents.DataSetId = (0, smithy_client_1.expectString)(data.DataSetId);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.Name !== undefined && data.Name !== null) {
+    if (data.Name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.Name);
     }
-    if (data.RevisionId !== undefined && data.RevisionId !== null) {
+    if (data.RevisionId != null) {
         contents.RevisionId = (0, smithy_client_1.expectString)(data.RevisionId);
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateAssetCommand = deserializeAws_restJson1UpdateAssetCommand;
 const deserializeAws_restJson1UpdateAssetCommandError = async (output, context) => {
@@ -2506,7 +2008,6 @@ const deserializeAws_restJson1UpdateAssetCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2529,65 +2030,53 @@ const deserializeAws_restJson1UpdateAssetCommandError = async (output, context)
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateDataSetCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateDataSetCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        AssetType: undefined,
-        CreatedAt: undefined,
-        Description: undefined,
-        Id: undefined,
-        Name: undefined,
-        Origin: undefined,
-        OriginDetails: undefined,
-        SourceId: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.AssetType !== undefined && data.AssetType !== null) {
+    if (data.AssetType != null) {
         contents.AssetType = (0, smithy_client_1.expectString)(data.AssetType);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.Description !== undefined && data.Description !== null) {
+    if (data.Description != null) {
         contents.Description = (0, smithy_client_1.expectString)(data.Description);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.Name !== undefined && data.Name !== null) {
+    if (data.Name != null) {
         contents.Name = (0, smithy_client_1.expectString)(data.Name);
     }
-    if (data.Origin !== undefined && data.Origin !== null) {
+    if (data.Origin != null) {
         contents.Origin = (0, smithy_client_1.expectString)(data.Origin);
     }
-    if (data.OriginDetails !== undefined && data.OriginDetails !== null) {
+    if (data.OriginDetails != null) {
         contents.OriginDetails = deserializeAws_restJson1OriginDetails(data.OriginDetails, context);
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateDataSetCommand = deserializeAws_restJson1UpdateDataSetCommand;
 const deserializeAws_restJson1UpdateDataSetCommandError = async (output, context) => {
@@ -2595,7 +2084,6 @@ const deserializeAws_restJson1UpdateDataSetCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2615,49 +2103,41 @@ const deserializeAws_restJson1UpdateDataSetCommandError = async (output, context
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateEventActionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateEventActionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Action: undefined,
-        Arn: undefined,
-        CreatedAt: undefined,
-        Event: undefined,
-        Id: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Action !== undefined && data.Action !== null) {
+    if (data.Action != null) {
         contents.Action = deserializeAws_restJson1Action(data.Action, context);
     }
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.Event !== undefined && data.Event !== null) {
+    if (data.Event != null) {
         contents.Event = deserializeAws_restJson1Event(data.Event, context);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateEventActionCommand = deserializeAws_restJson1UpdateEventActionCommand;
 const deserializeAws_restJson1UpdateEventActionCommandError = async (output, context) => {
@@ -2665,7 +2145,6 @@ const deserializeAws_restJson1UpdateEventActionCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2685,69 +2164,56 @@ const deserializeAws_restJson1UpdateEventActionCommandError = async (output, con
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateRevisionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateRevisionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        Arn: undefined,
-        Comment: undefined,
-        CreatedAt: undefined,
-        DataSetId: undefined,
-        Finalized: undefined,
-        Id: undefined,
-        RevocationComment: undefined,
-        Revoked: undefined,
-        RevokedAt: undefined,
-        SourceId: undefined,
-        UpdatedAt: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.Arn !== undefined && data.Arn !== null) {
+    if (data.Arn != null) {
         contents.Arn = (0, smithy_client_1.expectString)(data.Arn);
     }
-    if (data.Comment !== undefined && data.Comment !== null) {
+    if (data.Comment != null) {
         contents.Comment = (0, smithy_client_1.expectString)(data.Comment);
     }
-    if (data.CreatedAt !== undefined && data.CreatedAt !== null) {
+    if (data.CreatedAt != null) {
         contents.CreatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.CreatedAt));
     }
-    if (data.DataSetId !== undefined && data.DataSetId !== null) {
+    if (data.DataSetId != null) {
         contents.DataSetId = (0, smithy_client_1.expectString)(data.DataSetId);
     }
-    if (data.Finalized !== undefined && data.Finalized !== null) {
+    if (data.Finalized != null) {
         contents.Finalized = (0, smithy_client_1.expectBoolean)(data.Finalized);
     }
-    if (data.Id !== undefined && data.Id !== null) {
+    if (data.Id != null) {
         contents.Id = (0, smithy_client_1.expectString)(data.Id);
     }
-    if (data.RevocationComment !== undefined && data.RevocationComment !== null) {
+    if (data.RevocationComment != null) {
         contents.RevocationComment = (0, smithy_client_1.expectString)(data.RevocationComment);
     }
-    if (data.Revoked !== undefined && data.Revoked !== null) {
+    if (data.Revoked != null) {
         contents.Revoked = (0, smithy_client_1.expectBoolean)(data.Revoked);
     }
-    if (data.RevokedAt !== undefined && data.RevokedAt !== null) {
+    if (data.RevokedAt != null) {
         contents.RevokedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.RevokedAt));
     }
-    if (data.SourceId !== undefined && data.SourceId !== null) {
+    if (data.SourceId != null) {
         contents.SourceId = (0, smithy_client_1.expectString)(data.SourceId);
     }
-    if (data.UpdatedAt !== undefined && data.UpdatedAt !== null) {
+    if (data.UpdatedAt != null) {
         contents.UpdatedAt = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseRfc3339DateTime)(data.UpdatedAt));
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateRevisionCommand = deserializeAws_restJson1UpdateRevisionCommand;
 const deserializeAws_restJson1UpdateRevisionCommandError = async (output, context) => {
@@ -2755,7 +2221,6 @@ const deserializeAws_restJson1UpdateRevisionCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2778,20 +2243,19 @@ const deserializeAws_restJson1UpdateRevisionCommandError = async (output, contex
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new DataExchangeServiceException_1.DataExchangeServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: DataExchangeServiceException_1.DataExchangeServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
+const map = smithy_client_1.map;
 const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.Message !== undefined && data.Message !== null) {
+    if (data.Message != null) {
         contents.Message = (0, smithy_client_1.expectString)(data.Message);
     }
     const exception = new models_0_1.AccessDeniedException({
@@ -2801,15 +2265,15 @@ const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutpu
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.Message !== undefined && data.Message !== null) {
+    if (data.Message != null) {
         contents.Message = (0, smithy_client_1.expectString)(data.Message);
     }
-    if (data.ResourceId !== undefined && data.ResourceId !== null) {
+    if (data.ResourceId != null) {
         contents.ResourceId = (0, smithy_client_1.expectString)(data.ResourceId);
     }
-    if (data.ResourceType !== undefined && data.ResourceType !== null) {
+    if (data.ResourceType != null) {
         contents.ResourceType = (0, smithy_client_1.expectString)(data.ResourceType);
     }
     const exception = new models_0_1.ConflictException({
@@ -2819,9 +2283,9 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.Message !== undefined && data.Message !== null) {
+    if (data.Message != null) {
         contents.Message = (0, smithy_client_1.expectString)(data.Message);
     }
     const exception = new models_0_1.InternalServerException({
@@ -2831,15 +2295,15 @@ const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOut
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.Message !== undefined && data.Message !== null) {
+    if (data.Message != null) {
         contents.Message = (0, smithy_client_1.expectString)(data.Message);
     }
-    if (data.ResourceId !== undefined && data.ResourceId !== null) {
+    if (data.ResourceId != null) {
         contents.ResourceId = (0, smithy_client_1.expectString)(data.ResourceId);
     }
-    if (data.ResourceType !== undefined && data.ResourceType !== null) {
+    if (data.ResourceType != null) {
         contents.ResourceType = (0, smithy_client_1.expectString)(data.ResourceType);
     }
     const exception = new models_0_1.ResourceNotFoundException({
@@ -2849,15 +2313,15 @@ const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedO
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ServiceLimitExceededExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.LimitName !== undefined && data.LimitName !== null) {
+    if (data.LimitName != null) {
         contents.LimitName = (0, smithy_client_1.expectString)(data.LimitName);
     }
-    if (data.LimitValue !== undefined && data.LimitValue !== null) {
+    if (data.LimitValue != null) {
         contents.LimitValue = (0, smithy_client_1.limitedParseDouble)(data.LimitValue);
     }
-    if (data.Message !== undefined && data.Message !== null) {
+    if (data.Message != null) {
         contents.Message = (0, smithy_client_1.expectString)(data.Message);
     }
     const exception = new models_0_1.ServiceLimitExceededException({
@@ -2867,9 +2331,9 @@ const deserializeAws_restJson1ServiceLimitExceededExceptionResponse = async (par
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.Message !== undefined && data.Message !== null) {
+    if (data.Message != null) {
         contents.Message = (0, smithy_client_1.expectString)(data.Message);
     }
     const exception = new models_0_1.ThrottlingException({
@@ -2879,12 +2343,12 @@ const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput,
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
+    const contents = map({});
     const data = parsedOutput.body;
-    if (data.ExceptionCause !== undefined && data.ExceptionCause !== null) {
+    if (data.ExceptionCause != null) {
         contents.ExceptionCause = (0, smithy_client_1.expectString)(data.ExceptionCause);
     }
-    if (data.Message !== undefined && data.Message !== null) {
+    if (data.Message != null) {
         contents.Message = (0, smithy_client_1.expectString)(data.Message);
     }
     const exception = new models_0_1.ValidationException({
@@ -3015,9 +2479,6 @@ const serializeAws_restJson1ListOfAssetDestinationEntry = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AssetDestinationEntry(entry, context);
     });
 };
@@ -3025,9 +2486,6 @@ const serializeAws_restJson1ListOfAssetSourceEntry = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AssetSourceEntry(entry, context);
     });
 };
@@ -3035,9 +2493,6 @@ const serializeAws_restJson1ListOfRedshiftDataShareAssetSourceEntry = (input, co
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1RedshiftDataShareAssetSourceEntry(entry, context);
     });
 };
@@ -3045,9 +2500,6 @@ const serializeAws_restJson1ListOfRevisionDestinationEntry = (input, context) =>
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1RevisionDestinationEntry(entry, context);
     });
 };