@aws-sdk/client-m2 3.141.0 → 3.142.0

package/dist-cjs/protocols/Aws_restJson1.js

@@ -12,26 +12,8 @@ const serializeAws_restJson1CancelBatchJobExecutionCommand = async (input, conte
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/batch-job-executions/{executionId}/cancel";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    if (input.executionId !== undefined) {
-        const labelValue = input.executionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: executionId.");
-        }
-        resolvedPath = resolvedPath.replace("{executionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: executionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "executionId", () => input.executionId, "{executionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -79,16 +61,7 @@ const serializeAws_restJson1CreateDataSetImportTaskCommand = async (input, conte
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/dataset-import-task";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     body = JSON.stringify({
         clientToken: (_a = input.clientToken) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)(),
@@ -114,16 +87,7 @@ const serializeAws_restJson1CreateDeploymentCommand = async (input, context) =>
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/applications/{applicationId}/deployments";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     body = JSON.stringify({
         ...(input.applicationVersion != null && { applicationVersion: input.applicationVersion }),
@@ -185,16 +149,7 @@ const serializeAws_restJson1DeleteApplicationCommand = 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 || ""}` + "/applications/{applicationId}";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -212,26 +167,8 @@ const serializeAws_restJson1DeleteApplicationFromEnvironmentCommand = async (inp
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/environment/{environmentId}";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    if (input.environmentId !== undefined) {
-        const labelValue = input.environmentId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: environmentId.");
-        }
-        resolvedPath = resolvedPath.replace("{environmentId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: environmentId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "environmentId", () => input.environmentId, "{environmentId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -248,16 +185,7 @@ const serializeAws_restJson1DeleteEnvironmentCommand = 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 || ""}` + "/environments/{environmentId}";
-    if (input.environmentId !== undefined) {
-        const labelValue = input.environmentId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: environmentId.");
-        }
-        resolvedPath = resolvedPath.replace("{environmentId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: environmentId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "environmentId", () => input.environmentId, "{environmentId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -274,16 +202,7 @@ const serializeAws_restJson1GetApplicationCommand = 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 || ""}` + "/applications/{applicationId}";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -301,26 +220,8 @@ const serializeAws_restJson1GetApplicationVersionCommand = async (input, context
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/versions/{applicationVersion}";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    if (input.applicationVersion !== undefined) {
-        const labelValue = input.applicationVersion.toString();
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationVersion.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationVersion}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationVersion.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationVersion", () => input.applicationVersion.toString(), "{applicationVersion}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -338,26 +239,8 @@ const serializeAws_restJson1GetBatchJobExecutionCommand = async (input, context)
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/batch-job-executions/{executionId}";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    if (input.executionId !== undefined) {
-        const labelValue = input.executionId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: executionId.");
-        }
-        resolvedPath = resolvedPath.replace("{executionId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: executionId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "executionId", () => input.executionId, "{executionId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -375,26 +258,8 @@ const serializeAws_restJson1GetDataSetDetailsCommand = async (input, context) =>
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/datasets/{dataSetName}";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    if (input.dataSetName !== undefined) {
-        const labelValue = input.dataSetName;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: dataSetName.");
-        }
-        resolvedPath = resolvedPath.replace("{dataSetName}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: dataSetName.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "dataSetName", () => input.dataSetName, "{dataSetName}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -412,26 +277,8 @@ const serializeAws_restJson1GetDataSetImportTaskCommand = async (input, context)
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/dataset-import-tasks/{taskId}";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    if (input.taskId !== undefined) {
-        const labelValue = input.taskId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: taskId.");
-        }
-        resolvedPath = resolvedPath.replace("{taskId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: taskId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "taskId", () => input.taskId, "{taskId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -449,26 +296,8 @@ const serializeAws_restJson1GetDeploymentCommand = async (input, context) => {
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/deployments/{deploymentId}";
-    if (input.deploymentId !== undefined) {
-        const labelValue = input.deploymentId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: deploymentId.");
-        }
-        resolvedPath = resolvedPath.replace("{deploymentId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: deploymentId.");
-    }
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "deploymentId", () => input.deploymentId, "{deploymentId}", false);
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -485,16 +314,7 @@ const serializeAws_restJson1GetEnvironmentCommand = 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 || ""}` + "/environments/{environmentId}";
-    if (input.environmentId !== undefined) {
-        const labelValue = input.environmentId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: environmentId.");
-        }
-        resolvedPath = resolvedPath.replace("{environmentId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: environmentId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "environmentId", () => input.environmentId, "{environmentId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -511,12 +331,12 @@ const serializeAws_restJson1ListApplicationsCommand = 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 || ""}` + "/applications";
-    const query = {
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.names !== undefined && { names: (input.names || []).map((_entry) => _entry) }),
-        ...(input.environmentId !== undefined && { environmentId: input.environmentId }),
-    };
+    const query = map({
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        names: [() => input.names !== void 0, () => (input.names || []).map((_entry) => _entry)],
+        environmentId: [, input.environmentId],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -534,20 +354,11 @@ const serializeAws_restJson1ListApplicationVersionsCommand = async (input, conte
     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 || ""}` + "/applications/{applicationId}/versions";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    const query = {
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    const query = map({
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -566,21 +377,12 @@ const serializeAws_restJson1ListBatchJobDefinitionsCommand = async (input, conte
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/batch-job-definitions";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    const query = {
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.prefix !== undefined && { prefix: input.prefix }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    const query = map({
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        prefix: [, input.prefix],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -599,31 +401,25 @@ const serializeAws_restJson1ListBatchJobExecutionsCommand = async (input, contex
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/batch-job-executions";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    const query = {
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.executionIds !== undefined && {
-            executionIds: (input.executionIds || []).map((_entry) => _entry),
-        }),
-        ...(input.jobName !== undefined && { jobName: input.jobName }),
-        ...(input.status !== undefined && { status: input.status }),
-        ...(input.startedAfter !== undefined && {
-            startedAfter: (input.startedAfter.toISOString().split(".")[0] + "Z").toString(),
-        }),
-        ...(input.startedBefore !== undefined && {
-            startedBefore: (input.startedBefore.toISOString().split(".")[0] + "Z").toString(),
-        }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    const query = map({
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        executionIds: [
+            () => input.executionIds !== void 0,
+            () => (input.executionIds || []).map((_entry) => _entry),
+        ],
+        jobName: [, input.jobName],
+        status: [, input.status],
+        startedAfter: [
+            () => input.startedAfter !== void 0,
+            () => (input.startedAfter.toISOString().split(".")[0] + "Z").toString(),
+        ],
+        startedBefore: [
+            () => input.startedBefore !== void 0,
+            () => (input.startedBefore.toISOString().split(".")[0] + "Z").toString(),
+        ],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -642,20 +438,11 @@ const serializeAws_restJson1ListDataSetImportHistoryCommand = async (input, cont
     const headers = {};
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` +
         "/applications/{applicationId}/dataset-import-tasks";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    const query = {
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    const query = map({
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -673,21 +460,12 @@ const serializeAws_restJson1ListDataSetsCommand = 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 || ""}` + "/applications/{applicationId}/datasets";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    const query = {
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.prefix !== undefined && { prefix: input.prefix }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    const query = map({
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        prefix: [, input.prefix],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -705,20 +483,11 @@ const serializeAws_restJson1ListDeploymentsCommand = 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 || ""}` + "/applications/{applicationId}/deployments";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
-    const query = {
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-    };
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
+    const query = map({
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -736,11 +505,11 @@ const serializeAws_restJson1ListEngineVersionsCommand = 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 || ""}` + "/engine-versions";
-    const query = {
-        ...(input.engineType !== undefined && { engineType: input.engineType }),
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-    };
+    const query = map({
+        engineType: [, input.engineType],
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -758,12 +527,12 @@ const serializeAws_restJson1ListEnvironmentsCommand = 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 || ""}` + "/environments";
-    const query = {
-        ...(input.nextToken !== undefined && { nextToken: input.nextToken }),
-        ...(input.maxResults !== undefined && { maxResults: input.maxResults.toString() }),
-        ...(input.names !== undefined && { names: (input.names || []).map((_entry) => _entry) }),
-        ...(input.engineType !== undefined && { engineType: input.engineType }),
-    };
+    const query = map({
+        nextToken: [, input.nextToken],
+        maxResults: [() => input.maxResults !== void 0, () => input.maxResults.toString()],
+        names: [() => input.names !== void 0, () => (input.names || []).map((_entry) => _entry)],
+        engineType: [, input.engineType],
+    });
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -781,16 +550,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,
@@ -807,16 +567,7 @@ const serializeAws_restJson1StartApplicationCommand = 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 || ""}` + "/applications/{applicationId}/start";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     return new protocol_http_1.HttpRequest({
         protocol,
@@ -835,16 +586,7 @@ const serializeAws_restJson1StartBatchJobCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/applications/{applicationId}/batch-job";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     body = JSON.stringify({
         ...(input.batchJobIdentifier != null && {
@@ -871,16 +613,7 @@ const serializeAws_restJson1StopApplicationCommand = async (input, context) => {
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/applications/{applicationId}/stop";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     body = JSON.stringify({
         ...(input.forceStop != null && { forceStop: input.forceStop }),
@@ -902,16 +635,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_restJson1TagMap(input.tags, context) }),
@@ -931,19 +655,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,
@@ -963,16 +678,7 @@ const serializeAws_restJson1UpdateApplicationCommand = async (input, context) =>
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/applications/{applicationId}";
-    if (input.applicationId !== undefined) {
-        const labelValue = input.applicationId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: applicationId.");
-        }
-        resolvedPath = resolvedPath.replace("{applicationId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: applicationId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "applicationId", () => input.applicationId, "{applicationId}", false);
     let body;
     body = JSON.stringify({
         ...(input.currentApplicationVersion != null && { currentApplicationVersion: input.currentApplicationVersion }),
@@ -996,16 +702,7 @@ const serializeAws_restJson1UpdateEnvironmentCommand = async (input, context) =>
         "content-type": "application/json",
     };
     let resolvedPath = `${(basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || ""}` + "/environments/{environmentId}";
-    if (input.environmentId !== undefined) {
-        const labelValue = input.environmentId;
-        if (labelValue.length <= 0) {
-            throw new Error("Empty value provided for input HTTP label: environmentId.");
-        }
-        resolvedPath = resolvedPath.replace("{environmentId}", (0, smithy_client_1.extendedEncodeURIComponent)(labelValue));
-    }
-    else {
-        throw new Error("No value provided for input HTTP label: environmentId.");
-    }
+    resolvedPath = (0, smithy_client_1.resolvedPath)(resolvedPath, input, "environmentId", () => input.environmentId, "{environmentId}", false);
     let body;
     body = JSON.stringify({
         ...(input.applyDuringMaintenanceWindow != null && {
@@ -1031,11 +728,11 @@ const deserializeAws_restJson1CancelBatchJobExecutionCommand = async (output, co
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CancelBatchJobExecutionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CancelBatchJobExecutionCommand = deserializeAws_restJson1CancelBatchJobExecutionCommand;
 const deserializeAws_restJson1CancelBatchJobExecutionCommandError = async (output, context) => {
@@ -1043,7 +740,6 @@ const deserializeAws_restJson1CancelBatchJobExecutionCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1066,37 +762,32 @@ const deserializeAws_restJson1CancelBatchJobExecutionCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateApplicationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateApplicationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        applicationArn: undefined,
-        applicationId: undefined,
-        applicationVersion: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.applicationArn !== undefined && data.applicationArn !== null) {
+    if (data.applicationArn != null) {
         contents.applicationArn = (0, smithy_client_1.expectString)(data.applicationArn);
     }
-    if (data.applicationId !== undefined && data.applicationId !== null) {
+    if (data.applicationId != null) {
         contents.applicationId = (0, smithy_client_1.expectString)(data.applicationId);
     }
-    if (data.applicationVersion !== undefined && data.applicationVersion !== null) {
+    if (data.applicationVersion != null) {
         contents.applicationVersion = (0, smithy_client_1.expectInt32)(data.applicationVersion);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateApplicationCommand = deserializeAws_restJson1CreateApplicationCommand;
 const deserializeAws_restJson1CreateApplicationCommandError = async (output, context) => {
@@ -1104,7 +795,6 @@ const deserializeAws_restJson1CreateApplicationCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1127,29 +817,26 @@ const deserializeAws_restJson1CreateApplicationCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateDataSetImportTaskCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateDataSetImportTaskCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        taskId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.taskId !== undefined && data.taskId !== null) {
+    if (data.taskId != null) {
         contents.taskId = (0, smithy_client_1.expectString)(data.taskId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateDataSetImportTaskCommand = deserializeAws_restJson1CreateDataSetImportTaskCommand;
 const deserializeAws_restJson1CreateDataSetImportTaskCommandError = async (output, context) => {
@@ -1157,7 +844,6 @@ const deserializeAws_restJson1CreateDataSetImportTaskCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1183,29 +869,26 @@ const deserializeAws_restJson1CreateDataSetImportTaskCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateDeploymentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateDeploymentCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        deploymentId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.deploymentId !== undefined && data.deploymentId !== null) {
+    if (data.deploymentId != null) {
         contents.deploymentId = (0, smithy_client_1.expectString)(data.deploymentId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateDeploymentCommand = deserializeAws_restJson1CreateDeploymentCommand;
 const deserializeAws_restJson1CreateDeploymentCommandError = async (output, context) => {
@@ -1213,7 +896,6 @@ const deserializeAws_restJson1CreateDeploymentCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1239,29 +921,26 @@ const deserializeAws_restJson1CreateDeploymentCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1CreateEnvironmentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1CreateEnvironmentCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        environmentId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.environmentId !== undefined && data.environmentId !== null) {
+    if (data.environmentId != null) {
         contents.environmentId = (0, smithy_client_1.expectString)(data.environmentId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1CreateEnvironmentCommand = deserializeAws_restJson1CreateEnvironmentCommand;
 const deserializeAws_restJson1CreateEnvironmentCommandError = async (output, context) => {
@@ -1269,7 +948,6 @@ const deserializeAws_restJson1CreateEnvironmentCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1292,25 +970,23 @@ const deserializeAws_restJson1CreateEnvironmentCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteApplicationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteApplicationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteApplicationCommand = deserializeAws_restJson1DeleteApplicationCommand;
 const deserializeAws_restJson1DeleteApplicationCommandError = async (output, context) => {
@@ -1318,7 +994,6 @@ const deserializeAws_restJson1DeleteApplicationCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1338,25 +1013,23 @@ const deserializeAws_restJson1DeleteApplicationCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteApplicationFromEnvironmentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteApplicationFromEnvironmentCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteApplicationFromEnvironmentCommand = deserializeAws_restJson1DeleteApplicationFromEnvironmentCommand;
 const deserializeAws_restJson1DeleteApplicationFromEnvironmentCommandError = async (output, context) => {
@@ -1364,7 +1037,6 @@ const deserializeAws_restJson1DeleteApplicationFromEnvironmentCommandError = asy
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1387,25 +1059,23 @@ const deserializeAws_restJson1DeleteApplicationFromEnvironmentCommandError = asy
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1DeleteEnvironmentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1DeleteEnvironmentCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1DeleteEnvironmentCommand = deserializeAws_restJson1DeleteEnvironmentCommand;
 const deserializeAws_restJson1DeleteEnvironmentCommandError = async (output, context) => {
@@ -1413,7 +1083,6 @@ const deserializeAws_restJson1DeleteEnvironmentCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1433,97 +1102,77 @@ const deserializeAws_restJson1DeleteEnvironmentCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetApplicationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetApplicationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        applicationArn: undefined,
-        applicationId: undefined,
-        creationTime: undefined,
-        deployedVersion: undefined,
-        description: undefined,
-        engineType: undefined,
-        environmentId: undefined,
-        lastStartTime: undefined,
-        latestVersion: undefined,
-        listenerArns: undefined,
-        listenerPorts: undefined,
-        loadBalancerDnsName: undefined,
-        logGroups: undefined,
-        name: undefined,
-        status: undefined,
-        statusReason: undefined,
-        tags: undefined,
-        targetGroupArns: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.applicationArn !== undefined && data.applicationArn !== null) {
+    if (data.applicationArn != null) {
         contents.applicationArn = (0, smithy_client_1.expectString)(data.applicationArn);
     }
-    if (data.applicationId !== undefined && data.applicationId !== null) {
+    if (data.applicationId != null) {
         contents.applicationId = (0, smithy_client_1.expectString)(data.applicationId);
     }
-    if (data.creationTime !== undefined && data.creationTime !== null) {
+    if (data.creationTime != null) {
         contents.creationTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.creationTime)));
     }
-    if (data.deployedVersion !== undefined && data.deployedVersion !== null) {
+    if (data.deployedVersion != null) {
         contents.deployedVersion = deserializeAws_restJson1DeployedVersionSummary(data.deployedVersion, context);
     }
-    if (data.description !== undefined && data.description !== null) {
+    if (data.description != null) {
         contents.description = (0, smithy_client_1.expectString)(data.description);
     }
-    if (data.engineType !== undefined && data.engineType !== null) {
+    if (data.engineType != null) {
         contents.engineType = (0, smithy_client_1.expectString)(data.engineType);
     }
-    if (data.environmentId !== undefined && data.environmentId !== null) {
+    if (data.environmentId != null) {
         contents.environmentId = (0, smithy_client_1.expectString)(data.environmentId);
     }
-    if (data.lastStartTime !== undefined && data.lastStartTime !== null) {
+    if (data.lastStartTime != null) {
         contents.lastStartTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.lastStartTime)));
     }
-    if (data.latestVersion !== undefined && data.latestVersion !== null) {
+    if (data.latestVersion != null) {
         contents.latestVersion = deserializeAws_restJson1ApplicationVersionSummary(data.latestVersion, context);
     }
-    if (data.listenerArns !== undefined && data.listenerArns !== null) {
+    if (data.listenerArns != null) {
         contents.listenerArns = deserializeAws_restJson1ArnList(data.listenerArns, context);
     }
-    if (data.listenerPorts !== undefined && data.listenerPorts !== null) {
+    if (data.listenerPorts != null) {
         contents.listenerPorts = deserializeAws_restJson1PortList(data.listenerPorts, context);
     }
-    if (data.loadBalancerDnsName !== undefined && data.loadBalancerDnsName !== null) {
+    if (data.loadBalancerDnsName != null) {
         contents.loadBalancerDnsName = (0, smithy_client_1.expectString)(data.loadBalancerDnsName);
     }
-    if (data.logGroups !== undefined && data.logGroups !== null) {
+    if (data.logGroups != null) {
         contents.logGroups = deserializeAws_restJson1LogGroupSummaries(data.logGroups, context);
     }
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.name = (0, smithy_client_1.expectString)(data.name);
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.status = (0, smithy_client_1.expectString)(data.status);
     }
-    if (data.statusReason !== undefined && data.statusReason !== null) {
+    if (data.statusReason != null) {
         contents.statusReason = (0, smithy_client_1.expectString)(data.statusReason);
     }
-    if (data.tags !== undefined && data.tags !== null) {
+    if (data.tags != null) {
         contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
     }
-    if (data.targetGroupArns !== undefined && data.targetGroupArns !== null) {
+    if (data.targetGroupArns != null) {
         contents.targetGroupArns = deserializeAws_restJson1ArnList(data.targetGroupArns, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetApplicationCommand = deserializeAws_restJson1GetApplicationCommand;
 const deserializeAws_restJson1GetApplicationCommandError = async (output, context) => {
@@ -1531,7 +1180,6 @@ const deserializeAws_restJson1GetApplicationCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1551,53 +1199,44 @@ const deserializeAws_restJson1GetApplicationCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetApplicationVersionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetApplicationVersionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        applicationVersion: undefined,
-        creationTime: undefined,
-        definitionContent: undefined,
-        description: undefined,
-        name: undefined,
-        status: undefined,
-        statusReason: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.applicationVersion !== undefined && data.applicationVersion !== null) {
+    if (data.applicationVersion != null) {
         contents.applicationVersion = (0, smithy_client_1.expectInt32)(data.applicationVersion);
     }
-    if (data.creationTime !== undefined && data.creationTime !== null) {
+    if (data.creationTime != null) {
         contents.creationTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.creationTime)));
     }
-    if (data.definitionContent !== undefined && data.definitionContent !== null) {
+    if (data.definitionContent != null) {
         contents.definitionContent = (0, smithy_client_1.expectString)(data.definitionContent);
     }
-    if (data.description !== undefined && data.description !== null) {
+    if (data.description != null) {
         contents.description = (0, smithy_client_1.expectString)(data.description);
     }
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.name = (0, smithy_client_1.expectString)(data.name);
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.status = (0, smithy_client_1.expectString)(data.status);
     }
-    if (data.statusReason !== undefined && data.statusReason !== null) {
+    if (data.statusReason != null) {
         contents.statusReason = (0, smithy_client_1.expectString)(data.statusReason);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetApplicationVersionCommand = deserializeAws_restJson1GetApplicationVersionCommand;
 const deserializeAws_restJson1GetApplicationVersionCommandError = async (output, context) => {
@@ -1605,7 +1244,6 @@ const deserializeAws_restJson1GetApplicationVersionCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1625,65 +1263,53 @@ const deserializeAws_restJson1GetApplicationVersionCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetBatchJobExecutionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetBatchJobExecutionCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        applicationId: undefined,
-        endTime: undefined,
-        executionId: undefined,
-        jobId: undefined,
-        jobName: undefined,
-        jobType: undefined,
-        jobUser: undefined,
-        startTime: undefined,
-        status: undefined,
-        statusReason: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.applicationId !== undefined && data.applicationId !== null) {
+    if (data.applicationId != null) {
         contents.applicationId = (0, smithy_client_1.expectString)(data.applicationId);
     }
-    if (data.endTime !== undefined && data.endTime !== null) {
+    if (data.endTime != null) {
         contents.endTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.endTime)));
     }
-    if (data.executionId !== undefined && data.executionId !== null) {
+    if (data.executionId != null) {
         contents.executionId = (0, smithy_client_1.expectString)(data.executionId);
     }
-    if (data.jobId !== undefined && data.jobId !== null) {
+    if (data.jobId != null) {
         contents.jobId = (0, smithy_client_1.expectString)(data.jobId);
     }
-    if (data.jobName !== undefined && data.jobName !== null) {
+    if (data.jobName != null) {
         contents.jobName = (0, smithy_client_1.expectString)(data.jobName);
     }
-    if (data.jobType !== undefined && data.jobType !== null) {
+    if (data.jobType != null) {
         contents.jobType = (0, smithy_client_1.expectString)(data.jobType);
     }
-    if (data.jobUser !== undefined && data.jobUser !== null) {
+    if (data.jobUser != null) {
         contents.jobUser = (0, smithy_client_1.expectString)(data.jobUser);
     }
-    if (data.startTime !== undefined && data.startTime !== null) {
+    if (data.startTime != null) {
         contents.startTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.startTime)));
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.status = (0, smithy_client_1.expectString)(data.status);
     }
-    if (data.statusReason !== undefined && data.statusReason !== null) {
+    if (data.statusReason != null) {
         contents.statusReason = (0, smithy_client_1.expectString)(data.statusReason);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetBatchJobExecutionCommand = deserializeAws_restJson1GetBatchJobExecutionCommand;
 const deserializeAws_restJson1GetBatchJobExecutionCommandError = async (output, context) => {
@@ -1691,7 +1317,6 @@ const deserializeAws_restJson1GetBatchJobExecutionCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1711,57 +1336,47 @@ const deserializeAws_restJson1GetBatchJobExecutionCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetDataSetDetailsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetDataSetDetailsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        blocksize: undefined,
-        creationTime: undefined,
-        dataSetName: undefined,
-        dataSetOrg: undefined,
-        lastReferencedTime: undefined,
-        lastUpdatedTime: undefined,
-        location: undefined,
-        recordLength: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.blocksize !== undefined && data.blocksize !== null) {
+    if (data.blocksize != null) {
         contents.blocksize = (0, smithy_client_1.expectInt32)(data.blocksize);
     }
-    if (data.creationTime !== undefined && data.creationTime !== null) {
+    if (data.creationTime != null) {
         contents.creationTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.creationTime)));
     }
-    if (data.dataSetName !== undefined && data.dataSetName !== null) {
+    if (data.dataSetName != null) {
         contents.dataSetName = (0, smithy_client_1.expectString)(data.dataSetName);
     }
-    if (data.dataSetOrg !== undefined && data.dataSetOrg !== null) {
+    if (data.dataSetOrg != null) {
         contents.dataSetOrg = deserializeAws_restJson1DatasetDetailOrgAttributes((0, smithy_client_1.expectUnion)(data.dataSetOrg), context);
     }
-    if (data.lastReferencedTime !== undefined && data.lastReferencedTime !== null) {
+    if (data.lastReferencedTime != null) {
         contents.lastReferencedTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.lastReferencedTime)));
     }
-    if (data.lastUpdatedTime !== undefined && data.lastUpdatedTime !== null) {
+    if (data.lastUpdatedTime != null) {
         contents.lastUpdatedTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.lastUpdatedTime)));
     }
-    if (data.location !== undefined && data.location !== null) {
+    if (data.location != null) {
         contents.location = (0, smithy_client_1.expectString)(data.location);
     }
-    if (data.recordLength !== undefined && data.recordLength !== null) {
+    if (data.recordLength != null) {
         contents.recordLength = (0, smithy_client_1.expectInt32)(data.recordLength);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetDataSetDetailsCommand = deserializeAws_restJson1GetDataSetDetailsCommand;
 const deserializeAws_restJson1GetDataSetDetailsCommandError = async (output, context) => {
@@ -1769,7 +1384,6 @@ const deserializeAws_restJson1GetDataSetDetailsCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1789,37 +1403,32 @@ const deserializeAws_restJson1GetDataSetDetailsCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetDataSetImportTaskCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetDataSetImportTaskCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        status: undefined,
-        summary: undefined,
-        taskId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.status = (0, smithy_client_1.expectString)(data.status);
     }
-    if (data.summary !== undefined && data.summary !== null) {
+    if (data.summary != null) {
         contents.summary = deserializeAws_restJson1DataSetImportSummary(data.summary, context);
     }
-    if (data.taskId !== undefined && data.taskId !== null) {
+    if (data.taskId != null) {
         contents.taskId = (0, smithy_client_1.expectString)(data.taskId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetDataSetImportTaskCommand = deserializeAws_restJson1GetDataSetImportTaskCommand;
 const deserializeAws_restJson1GetDataSetImportTaskCommandError = async (output, context) => {
@@ -1827,7 +1436,6 @@ const deserializeAws_restJson1GetDataSetImportTaskCommandError = async (output,
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1847,53 +1455,44 @@ const deserializeAws_restJson1GetDataSetImportTaskCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetDeploymentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetDeploymentCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        applicationId: undefined,
-        applicationVersion: undefined,
-        creationTime: undefined,
-        deploymentId: undefined,
-        environmentId: undefined,
-        status: undefined,
-        statusReason: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.applicationId !== undefined && data.applicationId !== null) {
+    if (data.applicationId != null) {
         contents.applicationId = (0, smithy_client_1.expectString)(data.applicationId);
     }
-    if (data.applicationVersion !== undefined && data.applicationVersion !== null) {
+    if (data.applicationVersion != null) {
         contents.applicationVersion = (0, smithy_client_1.expectInt32)(data.applicationVersion);
     }
-    if (data.creationTime !== undefined && data.creationTime !== null) {
+    if (data.creationTime != null) {
         contents.creationTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.creationTime)));
     }
-    if (data.deploymentId !== undefined && data.deploymentId !== null) {
+    if (data.deploymentId != null) {
         contents.deploymentId = (0, smithy_client_1.expectString)(data.deploymentId);
     }
-    if (data.environmentId !== undefined && data.environmentId !== null) {
+    if (data.environmentId != null) {
         contents.environmentId = (0, smithy_client_1.expectString)(data.environmentId);
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.status = (0, smithy_client_1.expectString)(data.status);
     }
-    if (data.statusReason !== undefined && data.statusReason !== null) {
+    if (data.statusReason != null) {
         contents.statusReason = (0, smithy_client_1.expectString)(data.statusReason);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetDeploymentCommand = deserializeAws_restJson1GetDeploymentCommand;
 const deserializeAws_restJson1GetDeploymentCommandError = async (output, context) => {
@@ -1901,7 +1500,6 @@ const deserializeAws_restJson1GetDeploymentCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -1921,109 +1519,86 @@ const deserializeAws_restJson1GetDeploymentCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1GetEnvironmentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1GetEnvironmentCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        actualCapacity: undefined,
-        creationTime: undefined,
-        description: undefined,
-        engineType: undefined,
-        engineVersion: undefined,
-        environmentArn: undefined,
-        environmentId: undefined,
-        highAvailabilityConfig: undefined,
-        instanceType: undefined,
-        loadBalancerArn: undefined,
-        name: undefined,
-        pendingMaintenance: undefined,
-        preferredMaintenanceWindow: undefined,
-        publiclyAccessible: undefined,
-        securityGroupIds: undefined,
-        status: undefined,
-        statusReason: undefined,
-        storageConfigurations: undefined,
-        subnetIds: undefined,
-        tags: undefined,
-        vpcId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.actualCapacity !== undefined && data.actualCapacity !== null) {
+    if (data.actualCapacity != null) {
         contents.actualCapacity = (0, smithy_client_1.expectInt32)(data.actualCapacity);
     }
-    if (data.creationTime !== undefined && data.creationTime !== null) {
+    if (data.creationTime != null) {
         contents.creationTime = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.parseEpochTimestamp)((0, smithy_client_1.expectNumber)(data.creationTime)));
     }
-    if (data.description !== undefined && data.description !== null) {
+    if (data.description != null) {
         contents.description = (0, smithy_client_1.expectString)(data.description);
     }
-    if (data.engineType !== undefined && data.engineType !== null) {
+    if (data.engineType != null) {
         contents.engineType = (0, smithy_client_1.expectString)(data.engineType);
     }
-    if (data.engineVersion !== undefined && data.engineVersion !== null) {
+    if (data.engineVersion != null) {
         contents.engineVersion = (0, smithy_client_1.expectString)(data.engineVersion);
     }
-    if (data.environmentArn !== undefined && data.environmentArn !== null) {
+    if (data.environmentArn != null) {
         contents.environmentArn = (0, smithy_client_1.expectString)(data.environmentArn);
     }
-    if (data.environmentId !== undefined && data.environmentId !== null) {
+    if (data.environmentId != null) {
         contents.environmentId = (0, smithy_client_1.expectString)(data.environmentId);
     }
-    if (data.highAvailabilityConfig !== undefined && data.highAvailabilityConfig !== null) {
+    if (data.highAvailabilityConfig != null) {
         contents.highAvailabilityConfig = deserializeAws_restJson1HighAvailabilityConfig(data.highAvailabilityConfig, context);
     }
-    if (data.instanceType !== undefined && data.instanceType !== null) {
+    if (data.instanceType != null) {
         contents.instanceType = (0, smithy_client_1.expectString)(data.instanceType);
     }
-    if (data.loadBalancerArn !== undefined && data.loadBalancerArn !== null) {
+    if (data.loadBalancerArn != null) {
         contents.loadBalancerArn = (0, smithy_client_1.expectString)(data.loadBalancerArn);
     }
-    if (data.name !== undefined && data.name !== null) {
+    if (data.name != null) {
         contents.name = (0, smithy_client_1.expectString)(data.name);
     }
-    if (data.pendingMaintenance !== undefined && data.pendingMaintenance !== null) {
+    if (data.pendingMaintenance != null) {
         contents.pendingMaintenance = deserializeAws_restJson1PendingMaintenance(data.pendingMaintenance, context);
     }
-    if (data.preferredMaintenanceWindow !== undefined && data.preferredMaintenanceWindow !== null) {
+    if (data.preferredMaintenanceWindow != null) {
         contents.preferredMaintenanceWindow = (0, smithy_client_1.expectString)(data.preferredMaintenanceWindow);
     }
-    if (data.publiclyAccessible !== undefined && data.publiclyAccessible !== null) {
+    if (data.publiclyAccessible != null) {
         contents.publiclyAccessible = (0, smithy_client_1.expectBoolean)(data.publiclyAccessible);
     }
-    if (data.securityGroupIds !== undefined && data.securityGroupIds !== null) {
+    if (data.securityGroupIds != null) {
         contents.securityGroupIds = deserializeAws_restJson1String50List(data.securityGroupIds, context);
     }
-    if (data.status !== undefined && data.status !== null) {
+    if (data.status != null) {
         contents.status = (0, smithy_client_1.expectString)(data.status);
     }
-    if (data.statusReason !== undefined && data.statusReason !== null) {
+    if (data.statusReason != null) {
         contents.statusReason = (0, smithy_client_1.expectString)(data.statusReason);
     }
-    if (data.storageConfigurations !== undefined && data.storageConfigurations !== null) {
+    if (data.storageConfigurations != null) {
         contents.storageConfigurations = deserializeAws_restJson1StorageConfigurationList(data.storageConfigurations, context);
     }
-    if (data.subnetIds !== undefined && data.subnetIds !== null) {
+    if (data.subnetIds != null) {
         contents.subnetIds = deserializeAws_restJson1String50List(data.subnetIds, context);
     }
-    if (data.tags !== undefined && data.tags !== null) {
+    if (data.tags != null) {
         contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
     }
-    if (data.vpcId !== undefined && data.vpcId !== null) {
+    if (data.vpcId != null) {
         contents.vpcId = (0, smithy_client_1.expectString)(data.vpcId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1GetEnvironmentCommand = deserializeAws_restJson1GetEnvironmentCommand;
 const deserializeAws_restJson1GetEnvironmentCommandError = async (output, context) => {
@@ -2031,7 +1606,6 @@ const deserializeAws_restJson1GetEnvironmentCommandError = async (output, contex
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2051,33 +1625,29 @@ const deserializeAws_restJson1GetEnvironmentCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListApplicationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListApplicationsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        applications: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.applications !== undefined && data.applications !== null) {
+    if (data.applications != null) {
         contents.applications = deserializeAws_restJson1ApplicationSummaryList(data.applications, 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_restJson1ListApplicationsCommand = deserializeAws_restJson1ListApplicationsCommand;
 const deserializeAws_restJson1ListApplicationsCommandError = async (output, context) => {
@@ -2085,7 +1655,6 @@ const deserializeAws_restJson1ListApplicationsCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2102,33 +1671,29 @@ const deserializeAws_restJson1ListApplicationsCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListApplicationVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListApplicationVersionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        applicationVersions: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.applicationVersions !== undefined && data.applicationVersions !== null) {
+    if (data.applicationVersions != null) {
         contents.applicationVersions = deserializeAws_restJson1ApplicationVersionSummaryList(data.applicationVersions, 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_restJson1ListApplicationVersionsCommand = deserializeAws_restJson1ListApplicationVersionsCommand;
 const deserializeAws_restJson1ListApplicationVersionsCommandError = async (output, context) => {
@@ -2136,7 +1701,6 @@ const deserializeAws_restJson1ListApplicationVersionsCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2156,33 +1720,29 @@ const deserializeAws_restJson1ListApplicationVersionsCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListBatchJobDefinitionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListBatchJobDefinitionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        batchJobDefinitions: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.batchJobDefinitions !== undefined && data.batchJobDefinitions !== null) {
+    if (data.batchJobDefinitions != null) {
         contents.batchJobDefinitions = deserializeAws_restJson1BatchJobDefinitions(data.batchJobDefinitions, 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_restJson1ListBatchJobDefinitionsCommand = deserializeAws_restJson1ListBatchJobDefinitionsCommand;
 const deserializeAws_restJson1ListBatchJobDefinitionsCommandError = async (output, context) => {
@@ -2190,7 +1750,6 @@ const deserializeAws_restJson1ListBatchJobDefinitionsCommandError = async (outpu
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2210,33 +1769,29 @@ const deserializeAws_restJson1ListBatchJobDefinitionsCommandError = async (outpu
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListBatchJobExecutionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListBatchJobExecutionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        batchJobExecutions: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.batchJobExecutions !== undefined && data.batchJobExecutions !== null) {
+    if (data.batchJobExecutions != null) {
         contents.batchJobExecutions = deserializeAws_restJson1BatchJobExecutionSummaryList(data.batchJobExecutions, 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_restJson1ListBatchJobExecutionsCommand = deserializeAws_restJson1ListBatchJobExecutionsCommand;
 const deserializeAws_restJson1ListBatchJobExecutionsCommandError = async (output, context) => {
@@ -2244,7 +1799,6 @@ const deserializeAws_restJson1ListBatchJobExecutionsCommandError = async (output
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2264,33 +1818,29 @@ const deserializeAws_restJson1ListBatchJobExecutionsCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListDataSetImportHistoryCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListDataSetImportHistoryCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        dataSetImportTasks: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.dataSetImportTasks !== undefined && data.dataSetImportTasks !== null) {
+    if (data.dataSetImportTasks != null) {
         contents.dataSetImportTasks = deserializeAws_restJson1DataSetImportTaskList(data.dataSetImportTasks, 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_restJson1ListDataSetImportHistoryCommand = deserializeAws_restJson1ListDataSetImportHistoryCommand;
 const deserializeAws_restJson1ListDataSetImportHistoryCommandError = async (output, context) => {
@@ -2298,7 +1848,6 @@ const deserializeAws_restJson1ListDataSetImportHistoryCommandError = async (outp
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2318,33 +1867,29 @@ const deserializeAws_restJson1ListDataSetImportHistoryCommandError = async (outp
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                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_restJson1DataSetsSummaryList(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) => {
@@ -2352,7 +1897,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 "AccessDeniedException":
@@ -2372,33 +1916,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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListDeploymentsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListDeploymentsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        deployments: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.deployments !== undefined && data.deployments !== null) {
+    if (data.deployments != null) {
         contents.deployments = deserializeAws_restJson1DeploymentList(data.deployments, 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_restJson1ListDeploymentsCommand = deserializeAws_restJson1ListDeploymentsCommand;
 const deserializeAws_restJson1ListDeploymentsCommandError = async (output, context) => {
@@ -2406,7 +1946,6 @@ const deserializeAws_restJson1ListDeploymentsCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2426,33 +1965,29 @@ const deserializeAws_restJson1ListDeploymentsCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListEngineVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListEngineVersionsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        engineVersions: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.engineVersions !== undefined && data.engineVersions !== null) {
+    if (data.engineVersions != null) {
         contents.engineVersions = deserializeAws_restJson1EngineVersionsSummaryList(data.engineVersions, 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_restJson1ListEngineVersionsCommand = deserializeAws_restJson1ListEngineVersionsCommand;
 const deserializeAws_restJson1ListEngineVersionsCommandError = async (output, context) => {
@@ -2460,7 +1995,6 @@ const deserializeAws_restJson1ListEngineVersionsCommandError = async (output, co
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2477,33 +2011,29 @@ const deserializeAws_restJson1ListEngineVersionsCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1ListEnvironmentsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1ListEnvironmentsCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        environments: undefined,
-        nextToken: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.environments !== undefined && data.environments !== null) {
+    if (data.environments != null) {
         contents.environments = deserializeAws_restJson1EnvironmentSummaryList(data.environments, 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_restJson1ListEnvironmentsCommand = deserializeAws_restJson1ListEnvironmentsCommand;
 const deserializeAws_restJson1ListEnvironmentsCommandError = async (output, context) => {
@@ -2511,7 +2041,6 @@ const deserializeAws_restJson1ListEnvironmentsCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2528,29 +2057,26 @@ const deserializeAws_restJson1ListEnvironmentsCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                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_restJson1TagMap(data.tags, context);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1ListTagsForResourceCommand = deserializeAws_restJson1ListTagsForResourceCommand;
 const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, context) => {
@@ -2558,7 +2084,6 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2578,25 +2103,23 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1StartApplicationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1StartApplicationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1StartApplicationCommand = deserializeAws_restJson1StartApplicationCommand;
 const deserializeAws_restJson1StartApplicationCommandError = async (output, context) => {
@@ -2604,7 +2127,6 @@ const deserializeAws_restJson1StartApplicationCommandError = async (output, cont
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2627,29 +2149,26 @@ const deserializeAws_restJson1StartApplicationCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1StartBatchJobCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1StartBatchJobCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        executionId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.executionId !== undefined && data.executionId !== null) {
+    if (data.executionId != null) {
         contents.executionId = (0, smithy_client_1.expectString)(data.executionId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1StartBatchJobCommand = deserializeAws_restJson1StartBatchJobCommand;
 const deserializeAws_restJson1StartBatchJobCommandError = async (output, context) => {
@@ -2657,7 +2176,6 @@ const deserializeAws_restJson1StartBatchJobCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2680,25 +2198,23 @@ const deserializeAws_restJson1StartBatchJobCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1StopApplicationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1StopApplicationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-    };
+    });
     await collectBody(output.body, context);
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1StopApplicationCommand = deserializeAws_restJson1StopApplicationCommand;
 const deserializeAws_restJson1StopApplicationCommandError = async (output, context) => {
@@ -2706,7 +2222,6 @@ const deserializeAws_restJson1StopApplicationCommandError = async (output, conte
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2729,25 +2244,23 @@ const deserializeAws_restJson1StopApplicationCommandError = async (output, conte
             throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            const $metadata = deserializeMetadata(output);
-            const statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-            response = new M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1TagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && 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) => {
@@ -2755,7 +2268,6 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2778,25 +2290,23 @@ const deserializeAws_restJson1TagResourceCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UntagResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && 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) => {
@@ -2804,7 +2314,6 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2824,29 +2333,26 @@ const deserializeAws_restJson1UntagResourceCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateApplicationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateApplicationCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        applicationVersion: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.applicationVersion !== undefined && data.applicationVersion !== null) {
+    if (data.applicationVersion != null) {
         contents.applicationVersion = (0, smithy_client_1.expectInt32)(data.applicationVersion);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateApplicationCommand = deserializeAws_restJson1UpdateApplicationCommand;
 const deserializeAws_restJson1UpdateApplicationCommandError = async (output, context) => {
@@ -2854,7 +2360,6 @@ const deserializeAws_restJson1UpdateApplicationCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2877,29 +2382,26 @@ const deserializeAws_restJson1UpdateApplicationCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                errorCode,
             });
-            throw (0, smithy_client_1.decorateServiceException)(response, parsedBody);
     }
 };
 const deserializeAws_restJson1UpdateEnvironmentCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
         return deserializeAws_restJson1UpdateEnvironmentCommandError(output, context);
     }
-    const contents = {
+    const contents = map({
         $metadata: deserializeMetadata(output),
-        environmentId: undefined,
-    };
+    });
     const data = (0, smithy_client_1.expectNonNull)((0, smithy_client_1.expectObject)(await parseBody(output.body, context)), "body");
-    if (data.environmentId !== undefined && data.environmentId !== null) {
+    if (data.environmentId != null) {
         contents.environmentId = (0, smithy_client_1.expectString)(data.environmentId);
     }
-    return Promise.resolve(contents);
+    return contents;
 };
 exports.deserializeAws_restJson1UpdateEnvironmentCommand = deserializeAws_restJson1UpdateEnvironmentCommand;
 const deserializeAws_restJson1UpdateEnvironmentCommandError = async (output, context) => {
@@ -2907,7 +2409,6 @@ const deserializeAws_restJson1UpdateEnvironmentCommandError = async (output, con
         ...output,
         body: await parseBody(output.body, context),
     };
-    let response;
     const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "AccessDeniedException":
@@ -2933,20 +2434,19 @@ const deserializeAws_restJson1UpdateEnvironmentCommandError = 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 M2ServiceException_1.M2ServiceException({
-                name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                $fault: "client",
-                $metadata,
+            (0, smithy_client_1.throwDefaultError)({
+                output,
+                parsedBody,
+                exceptionCtor: M2ServiceException_1.M2ServiceException,
+                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({
@@ -2956,15 +2456,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({
@@ -2974,12 +2474,14 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalServerExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
-    if (parsedOutput.headers["retry-after"] !== undefined) {
-        contents.retryAfterSeconds = (0, smithy_client_1.strictParseInt32)(parsedOutput.headers["retry-after"]);
-    }
+    const contents = map({
+        retryAfterSeconds: [
+            () => void 0 !== parsedOutput.headers["retry-after"],
+            () => (0, smithy_client_1.strictParseInt32)(parsedOutput.headers["retry-after"]),
+        ],
+    });
     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({
@@ -2989,15 +2491,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({
@@ -3007,21 +2509,21 @@ const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedO
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = 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.quotaCode !== undefined && data.quotaCode !== null) {
+    if (data.quotaCode != null) {
         contents.quotaCode = (0, smithy_client_1.expectString)(data.quotaCode);
     }
-    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);
     }
-    if (data.serviceCode !== undefined && data.serviceCode !== null) {
+    if (data.serviceCode != null) {
         contents.serviceCode = (0, smithy_client_1.expectString)(data.serviceCode);
     }
     const exception = new models_0_1.ServiceQuotaExceededException({
@@ -3031,18 +2533,20 @@ const deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = async (par
     return (0, smithy_client_1.decorateServiceException)(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ThrottlingExceptionResponse = async (parsedOutput, context) => {
-    const contents = {};
-    if (parsedOutput.headers["retry-after"] !== undefined) {
-        contents.retryAfterSeconds = (0, smithy_client_1.strictParseInt32)(parsedOutput.headers["retry-after"]);
-    }
+    const contents = map({
+        retryAfterSeconds: [
+            () => void 0 !== parsedOutput.headers["retry-after"],
+            () => (0, smithy_client_1.strictParseInt32)(parsedOutput.headers["retry-after"]),
+        ],
+    });
     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.quotaCode !== undefined && data.quotaCode !== null) {
+    if (data.quotaCode != null) {
         contents.quotaCode = (0, smithy_client_1.expectString)(data.quotaCode);
     }
-    if (data.serviceCode !== undefined && data.serviceCode !== null) {
+    if (data.serviceCode != null) {
         contents.serviceCode = (0, smithy_client_1.expectString)(data.serviceCode);
     }
     const exception = new models_0_1.ThrottlingException({
@@ -3052,15 +2556,15 @@ 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.fieldList !== undefined && data.fieldList !== null) {
+    if (data.fieldList != null) {
         contents.fieldList = deserializeAws_restJson1ValidationExceptionFieldList(data.fieldList, context);
     }
-    if (data.message !== undefined && data.message !== null) {
+    if (data.message != null) {
         contents.message = (0, smithy_client_1.expectString)(data.message);
     }
-    if (data.reason !== undefined && data.reason !== null) {
+    if (data.reason != null) {
         contents.reason = (0, smithy_client_1.expectString)(data.reason);
     }
     const exception = new models_0_1.ValidationException({
@@ -3081,9 +2585,6 @@ const serializeAws_restJson1AlternateKeyList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1AlternateKey(entry, context);
     });
 };
@@ -3141,9 +2642,6 @@ const serializeAws_restJson1DataSetImportList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1DataSetImportItem(entry, context);
     });
 };
@@ -3225,9 +2723,6 @@ const serializeAws_restJson1StorageConfigurationList = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1StorageConfiguration(entry, context);
     });
 };
@@ -3235,9 +2730,6 @@ const serializeAws_restJson1String50List = (input, context) => {
     return input
         .filter((e) => e != null)
         .map((entry) => {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3346,12 +2838,12 @@ const deserializeAws_restJson1ArnList = (output, context) => {
     return retVal;
 };
 const deserializeAws_restJson1BatchJobDefinition = (output, context) => {
-    if (output.fileBatchJobDefinition !== undefined && output.fileBatchJobDefinition !== null) {
+    if (output.fileBatchJobDefinition != null) {
         return {
             fileBatchJobDefinition: deserializeAws_restJson1FileBatchJobDefinition(output.fileBatchJobDefinition, context),
         };
     }
-    if (output.scriptBatchJobDefinition !== undefined && output.scriptBatchJobDefinition !== null) {
+    if (output.scriptBatchJobDefinition != null) {
         return {
             scriptBatchJobDefinition: deserializeAws_restJson1ScriptBatchJobDefinition(output.scriptBatchJobDefinition, context),
         };
@@ -3393,12 +2885,12 @@ const deserializeAws_restJson1BatchJobExecutionSummaryList = (output, context) =
     return retVal;
 };
 const deserializeAws_restJson1DatasetDetailOrgAttributes = (output, context) => {
-    if (output.gdg !== undefined && output.gdg !== null) {
+    if (output.gdg != null) {
         return {
             gdg: deserializeAws_restJson1GdgDetailAttributes(output.gdg, context),
         };
     }
-    if (output.vsam !== undefined && output.vsam !== null) {
+    if (output.vsam != null) {
         return {
             vsam: deserializeAws_restJson1VsamDetailAttributes(output.vsam, context),
         };
@@ -3614,12 +3106,12 @@ const deserializeAws_restJson1ScriptBatchJobDefinition = (output, context) => {
     };
 };
 const deserializeAws_restJson1StorageConfiguration = (output, context) => {
-    if (output.efs !== undefined && output.efs !== null) {
+    if (output.efs != null) {
         return {
             efs: deserializeAws_restJson1EfsStorageConfiguration(output.efs, context),
         };
     }
-    if (output.fsx !== undefined && output.fsx !== null) {
+    if (output.fsx != null) {
         return {
             fsx: deserializeAws_restJson1FsxStorageConfiguration(output.fsx, context),
         };