npm - @aws-sdk/client-athena - Versions diffs - 3.50.0 → 3.53.0 - Mend

@aws-sdk/client-athena 3.50.0 → 3.53.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (73) hide show

package/dist-cjs/protocols/Aws_json1_1.js CHANGED Viewed

@@ -5,6 +5,8 @@ exports.deserializeAws_json1_1UpdateWorkGroupCommand = exports.deserializeAws_js
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
 const uuid_1 = require("uuid");
+const AthenaServiceException_1 = require("../models/AthenaServiceException");
+const models_0_1 = require("../models/models_0");
 const serializeAws_json1_1BatchGetNamedQueryCommand = async (input, context) => {
     const headers = {
         "content-type": "application/x-amz-json-1.1",
@@ -370,35 +372,19 @@ const deserializeAws_json1_1BatchGetNamedQueryCommandError = async (output, cont
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1BatchGetQueryExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -425,35 +411,19 @@ const deserializeAws_json1_1BatchGetQueryExecutionCommandError = async (output,
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateDataCatalogCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -480,35 +450,19 @@ const deserializeAws_json1_1CreateDataCatalogCommandError = async (output, conte
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateNamedQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -535,35 +489,19 @@ const deserializeAws_json1_1CreateNamedQueryCommandError = async (output, contex
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreatePreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -590,35 +528,19 @@ const deserializeAws_json1_1CreatePreparedStatementCommandError = async (output,
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1CreateWorkGroupCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -645,35 +567,19 @@ const deserializeAws_json1_1CreateWorkGroupCommandError = async (output, context
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeleteDataCatalogCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -700,35 +606,19 @@ const deserializeAws_json1_1DeleteDataCatalogCommandError = async (output, conte
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeleteNamedQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -755,35 +645,19 @@ const deserializeAws_json1_1DeleteNamedQueryCommandError = async (output, contex
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeletePreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -810,43 +684,22 @@ const deserializeAws_json1_1DeletePreparedStatementCommandError = async (output,
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.athena#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1DeleteWorkGroupCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -873,35 +726,19 @@ const deserializeAws_json1_1DeleteWorkGroupCommandError = async (output, context
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetDatabaseCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -928,43 +765,22 @@ const deserializeAws_json1_1GetDatabaseCommandError = async (output, context) =>
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "MetadataException":
         case "com.amazonaws.athena#MetadataException":
-            response = {
-                ...(await deserializeAws_json1_1MetadataExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MetadataExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetDataCatalogCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -991,35 +807,19 @@ const deserializeAws_json1_1GetDataCatalogCommandError = async (output, context)
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetNamedQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1046,35 +846,19 @@ const deserializeAws_json1_1GetNamedQueryCommandError = async (output, context)
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetPreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1101,43 +885,22 @@ const deserializeAws_json1_1GetPreparedStatementCommandError = async (output, co
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.athena#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetQueryExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1164,35 +927,19 @@ const deserializeAws_json1_1GetQueryExecutionCommandError = async (output, conte
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetQueryResultsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1219,35 +966,19 @@ const deserializeAws_json1_1GetQueryResultsCommandError = async (output, context
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetTableMetadataCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1274,43 +1005,22 @@ const deserializeAws_json1_1GetTableMetadataCommandError = async (output, contex
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "MetadataException":
         case "com.amazonaws.athena#MetadataException":
-            response = {
-                ...(await deserializeAws_json1_1MetadataExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MetadataExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1GetWorkGroupCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1337,35 +1047,19 @@ const deserializeAws_json1_1GetWorkGroupCommandError = async (output, context) =
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListDatabasesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1392,43 +1086,22 @@ const deserializeAws_json1_1ListDatabasesCommandError = async (output, context)
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "MetadataException":
         case "com.amazonaws.athena#MetadataException":
-            response = {
-                ...(await deserializeAws_json1_1MetadataExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MetadataExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListDataCatalogsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1455,35 +1128,19 @@ const deserializeAws_json1_1ListDataCatalogsCommandError = async (output, contex
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListEngineVersionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1510,35 +1167,19 @@ const deserializeAws_json1_1ListEngineVersionsCommandError = async (output, cont
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListNamedQueriesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1565,35 +1206,19 @@ const deserializeAws_json1_1ListNamedQueriesCommandError = async (output, contex
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListPreparedStatementsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1620,35 +1245,19 @@ const deserializeAws_json1_1ListPreparedStatementsCommandError = async (output,
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListQueryExecutionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1675,35 +1284,19 @@ const deserializeAws_json1_1ListQueryExecutionsCommandError = async (output, con
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListTableMetadataCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1730,43 +1323,22 @@ const deserializeAws_json1_1ListTableMetadataCommandError = async (output, conte
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "MetadataException":
         case "com.amazonaws.athena#MetadataException":
-            response = {
-                ...(await deserializeAws_json1_1MetadataExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1MetadataExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1793,43 +1365,22 @@ const deserializeAws_json1_1ListTagsForResourceCommandError = async (output, con
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.athena#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1ListWorkGroupsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1856,35 +1407,19 @@ const deserializeAws_json1_1ListWorkGroupsCommandError = async (output, context)
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1StartQueryExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1911,43 +1446,22 @@ const deserializeAws_json1_1StartQueryExecutionCommandError = async (output, con
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.athena#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_json1_1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1TooManyRequestsExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1StopQueryExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -1974,35 +1488,19 @@ const deserializeAws_json1_1StopQueryExecutionCommandError = async (output, cont
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1TagResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2029,43 +1527,22 @@ const deserializeAws_json1_1TagResourceCommandError = async (output, context) =>
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.athena#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1UntagResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2092,43 +1569,22 @@ const deserializeAws_json1_1UntagResourceCommandError = async (output, context)
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.athena#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1UpdateDataCatalogCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2155,35 +1611,19 @@ const deserializeAws_json1_1UpdateDataCatalogCommandError = async (output, conte
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1UpdatePreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2210,43 +1650,22 @@ const deserializeAws_json1_1UpdatePreparedStatementCommandError = async (output,
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.athena#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1UpdateWorkGroupCommand = async (output, context) => {
     if (output.statusCode >= 300) {
@@ -2273,90 +1692,64 @@ const deserializeAws_json1_1UpdateWorkGroupCommandError = async (output, context
     switch (errorCode) {
         case "InternalServerException":
         case "com.amazonaws.athena#InternalServerException":
-            response = {
-                ...(await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InternalServerExceptionResponse(parsedOutput, context);
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
-            response = {
-                ...(await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_json1_1InvalidRequestExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new AthenaServiceException_1.AthenaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_json1_1InternalServerExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InternalServerException(body, context);
-    const contents = {
-        name: "InternalServerException",
-        $fault: "server",
+    const exception = new models_0_1.InternalServerException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1InvalidRequestExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1InvalidRequestException(body, context);
-    const contents = {
-        name: "InvalidRequestException",
-        $fault: "client",
+    const exception = new models_0_1.InvalidRequestException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1MetadataExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1MetadataException(body, context);
-    const contents = {
-        name: "MetadataException",
-        $fault: "client",
+    const exception = new models_0_1.MetadataException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1ResourceNotFoundException(body, context);
-    const contents = {
-        name: "ResourceNotFoundException",
-        $fault: "client",
+    const exception = new models_0_1.ResourceNotFoundException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const deserializeAws_json1_1TooManyRequestsExceptionResponse = async (parsedOutput, context) => {
     const body = parsedOutput.body;
     const deserialized = deserializeAws_json1_1TooManyRequestsException(body, context);
-    const contents = {
-        name: "TooManyRequestsException",
-        $fault: "client",
+    const exception = new models_0_1.TooManyRequestsException({
         $metadata: deserializeMetadata(parsedOutput),
         ...deserialized,
-    };
-    return contents;
+    });
+    return smithy_client_1.decorateServiceException(exception, body);
 };
 const serializeAws_json1_1BatchGetNamedQueryInput = (input, context) => {
     return {
@@ -2778,6 +2171,7 @@ const serializeAws_json1_1WorkGroupConfigurationUpdates = (input, context) => {
 const deserializeAws_json1_1AthenaError = (output, context) => {
     return {
         ErrorCategory: smithy_client_1.expectInt32(output.ErrorCategory),
+        ErrorType: smithy_client_1.expectInt32(output.ErrorType),
     };
 };
 const deserializeAws_json1_1BatchGetNamedQueryOutput = (output, context) => {
@@ -2822,7 +2216,7 @@ const deserializeAws_json1_1ColumnInfo = (output, context) => {
     };
 };
 const deserializeAws_json1_1ColumnInfoList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -2830,9 +2224,10 @@ const deserializeAws_json1_1ColumnInfoList = (output, context) => {
         }
         return deserializeAws_json1_1ColumnInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ColumnList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -2840,6 +2235,7 @@ const deserializeAws_json1_1ColumnList = (output, context) => {
         }
         return deserializeAws_json1_1Column(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1CreateDataCatalogOutput = (output, context) => {
     return {};
@@ -2865,7 +2261,7 @@ const deserializeAws_json1_1Database = (output, context) => {
     };
 };
 const deserializeAws_json1_1DatabaseList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -2873,6 +2269,7 @@ const deserializeAws_json1_1DatabaseList = (output, context) => {
         }
         return deserializeAws_json1_1Database(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1DataCatalog = (output, context) => {
     return {
@@ -2891,7 +2288,7 @@ const deserializeAws_json1_1DataCatalogSummary = (output, context) => {
     };
 };
 const deserializeAws_json1_1DataCatalogSummaryList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -2899,6 +2296,7 @@ const deserializeAws_json1_1DataCatalogSummaryList = (output, context) => {
         }
         return deserializeAws_json1_1DataCatalogSummary(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Datum = (output, context) => {
     return {
@@ -2906,7 +2304,7 @@ const deserializeAws_json1_1Datum = (output, context) => {
     };
 };
 const deserializeAws_json1_1datumList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -2914,6 +2312,7 @@ const deserializeAws_json1_1datumList = (output, context) => {
         }
         return deserializeAws_json1_1Datum(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1DeleteDataCatalogOutput = (output, context) => {
     return {};
@@ -2940,7 +2339,7 @@ const deserializeAws_json1_1EngineVersion = (output, context) => {
     };
 };
 const deserializeAws_json1_1EngineVersionsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -2948,6 +2347,7 @@ const deserializeAws_json1_1EngineVersionsList = (output, context) => {
         }
         return deserializeAws_json1_1EngineVersion(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1GetDatabaseOutput = (output, context) => {
     return {
@@ -3106,7 +2506,7 @@ const deserializeAws_json1_1NamedQuery = (output, context) => {
     };
 };
 const deserializeAws_json1_1NamedQueryIdList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3114,9 +2514,10 @@ const deserializeAws_json1_1NamedQueryIdList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1NamedQueryList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3124,6 +2525,7 @@ const deserializeAws_json1_1NamedQueryList = (output, context) => {
         }
         return deserializeAws_json1_1NamedQuery(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1ParametersMap = (output, context) => {
     return Object.entries(output).reduce((acc, [key, value]) => {
@@ -3148,7 +2550,7 @@ const deserializeAws_json1_1PreparedStatement = (output, context) => {
     };
 };
 const deserializeAws_json1_1PreparedStatementsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3156,6 +2558,7 @@ const deserializeAws_json1_1PreparedStatementsList = (output, context) => {
         }
         return deserializeAws_json1_1PreparedStatementSummary(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1PreparedStatementSummary = (output, context) => {
     return {
@@ -3195,7 +2598,7 @@ const deserializeAws_json1_1QueryExecutionContext = (output, context) => {
     };
 };
 const deserializeAws_json1_1QueryExecutionIdList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3203,9 +2606,10 @@ const deserializeAws_json1_1QueryExecutionIdList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_json1_1QueryExecutionList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3213,6 +2617,7 @@ const deserializeAws_json1_1QueryExecutionList = (output, context) => {
         }
         return deserializeAws_json1_1QueryExecution(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1QueryExecutionStatistics = (output, context) => {
     return {
@@ -3280,7 +2685,7 @@ const deserializeAws_json1_1Row = (output, context) => {
     };
 };
 const deserializeAws_json1_1RowList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3288,6 +2693,7 @@ const deserializeAws_json1_1RowList = (output, context) => {
         }
         return deserializeAws_json1_1Row(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1StartQueryExecutionOutput = (output, context) => {
     return {
@@ -3319,7 +2725,7 @@ const deserializeAws_json1_1TableMetadata = (output, context) => {
     };
 };
 const deserializeAws_json1_1TableMetadataList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3327,6 +2733,7 @@ const deserializeAws_json1_1TableMetadataList = (output, context) => {
         }
         return deserializeAws_json1_1TableMetadata(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1Tag = (output, context) => {
     return {
@@ -3335,7 +2742,7 @@ const deserializeAws_json1_1Tag = (output, context) => {
     };
 };
 const deserializeAws_json1_1TagList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3343,6 +2750,7 @@ const deserializeAws_json1_1TagList = (output, context) => {
         }
         return deserializeAws_json1_1Tag(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1TagResourceOutput = (output, context) => {
     return {};
@@ -3361,7 +2769,7 @@ const deserializeAws_json1_1UnprocessedNamedQueryId = (output, context) => {
     };
 };
 const deserializeAws_json1_1UnprocessedNamedQueryIdList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3369,6 +2777,7 @@ const deserializeAws_json1_1UnprocessedNamedQueryIdList = (output, context) => {
         }
         return deserializeAws_json1_1UnprocessedNamedQueryId(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1UnprocessedQueryExecutionId = (output, context) => {
     return {
@@ -3378,7 +2787,7 @@ const deserializeAws_json1_1UnprocessedQueryExecutionId = (output, context) => {
     };
 };
 const deserializeAws_json1_1UnprocessedQueryExecutionIdList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3386,6 +2795,7 @@ const deserializeAws_json1_1UnprocessedQueryExecutionIdList = (output, context)
         }
         return deserializeAws_json1_1UnprocessedQueryExecutionId(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1UntagResourceOutput = (output, context) => {
     return {};
@@ -3427,7 +2837,7 @@ const deserializeAws_json1_1WorkGroupConfiguration = (output, context) => {
     };
 };
 const deserializeAws_json1_1WorkGroupsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -3435,6 +2845,7 @@ const deserializeAws_json1_1WorkGroupsList = (output, context) => {
         }
         return deserializeAws_json1_1WorkGroupSummary(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_json1_1WorkGroupSummary = (output, context) => {
     return {