@aws-sdk/client-athena 3.503.1 → 3.507.0

package/dist-es/protocols/Aws_json1_1.js

@@ -413,7 +413,7 @@ export const se_UpdateWorkGroupCommand = async (input, context) => {
 };
 export const de_BatchGetNamedQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_BatchGetNamedQueryCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -424,31 +424,9 @@ export const de_BatchGetNamedQueryCommand = async (output, context) => {
     };
     return response;
 };
-const de_BatchGetNamedQueryCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_BatchGetPreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_BatchGetPreparedStatementCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -459,31 +437,9 @@ export const de_BatchGetPreparedStatementCommand = async (output, context) => {
     };
     return response;
 };
-const de_BatchGetPreparedStatementCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_BatchGetQueryExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_BatchGetQueryExecutionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -494,31 +450,9 @@ export const de_BatchGetQueryExecutionCommand = async (output, context) => {
     };
     return response;
 };
-const de_BatchGetQueryExecutionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_CancelCapacityReservationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_CancelCapacityReservationCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -529,31 +463,9 @@ export const de_CancelCapacityReservationCommand = async (output, context) => {
     };
     return response;
 };
-const de_CancelCapacityReservationCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_CreateCapacityReservationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_CreateCapacityReservationCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -564,31 +476,9 @@ export const de_CreateCapacityReservationCommand = async (output, context) => {
     };
     return response;
 };
-const de_CreateCapacityReservationCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_CreateDataCatalogCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_CreateDataCatalogCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -599,31 +489,9 @@ export const de_CreateDataCatalogCommand = async (output, context) => {
     };
     return response;
 };
-const de_CreateDataCatalogCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_CreateNamedQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_CreateNamedQueryCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -634,31 +502,9 @@ export const de_CreateNamedQueryCommand = async (output, context) => {
     };
     return response;
 };
-const de_CreateNamedQueryCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_CreateNotebookCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_CreateNotebookCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -669,34 +515,9 @@ export const de_CreateNotebookCommand = async (output, context) => {
     };
     return response;
 };
-const de_CreateNotebookCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_CreatePreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_CreatePreparedStatementCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -707,31 +528,9 @@ export const de_CreatePreparedStatementCommand = async (output, context) => {
     };
     return response;
 };
-const de_CreatePreparedStatementCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_CreatePresignedNotebookUrlCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_CreatePresignedNotebookUrlCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -742,34 +541,9 @@ export const de_CreatePresignedNotebookUrlCommand = async (output, context) => {
     };
     return response;
 };
-const de_CreatePresignedNotebookUrlCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_CreateWorkGroupCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_CreateWorkGroupCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -780,31 +554,9 @@ export const de_CreateWorkGroupCommand = async (output, context) => {
     };
     return response;
 };
-const de_CreateWorkGroupCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_DeleteCapacityReservationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_DeleteCapacityReservationCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -815,66 +567,22 @@ export const de_DeleteCapacityReservationCommand = async (output, context) => {
     };
     return response;
 };
-const de_DeleteCapacityReservationCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
-export const de_DeleteDataCatalogCommand = async (output, context) => {
-    if (output.statusCode >= 300) {
-        return de_DeleteDataCatalogCommandError(output, context);
-    }
-    const data = await parseBody(output.body, context);
-    let contents = {};
-    contents = _json(data);
-    const response = {
-        $metadata: deserializeMetadata(output),
-        ...contents,
+export const de_DeleteDataCatalogCommand = async (output, context) => {
+    if (output.statusCode >= 300) {
+        return de_CommandError(output, context);
+    }
+    const data = await parseBody(output.body, context);
+    let contents = {};
+    contents = _json(data);
+    const response = {
+        $metadata: deserializeMetadata(output),
+        ...contents,
     };
     return response;
 };
-const de_DeleteDataCatalogCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_DeleteNamedQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_DeleteNamedQueryCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -885,31 +593,9 @@ export const de_DeleteNamedQueryCommand = async (output, context) => {
     };
     return response;
 };
-const de_DeleteNamedQueryCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_DeleteNotebookCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_DeleteNotebookCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -920,34 +606,9 @@ export const de_DeleteNotebookCommand = async (output, context) => {
     };
     return response;
 };
-const de_DeleteNotebookCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_DeletePreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_DeletePreparedStatementCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -958,34 +619,9 @@ export const de_DeletePreparedStatementCommand = async (output, context) => {
     };
     return response;
 };
-const de_DeletePreparedStatementCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_DeleteWorkGroupCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_DeleteWorkGroupCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -996,31 +632,9 @@ export const de_DeleteWorkGroupCommand = async (output, context) => {
     };
     return response;
 };
-const de_DeleteWorkGroupCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ExportNotebookCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ExportNotebookCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1031,34 +645,9 @@ export const de_ExportNotebookCommand = async (output, context) => {
     };
     return response;
 };
-const de_ExportNotebookCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetCalculationExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetCalculationExecutionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1069,34 +658,9 @@ export const de_GetCalculationExecutionCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetCalculationExecutionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetCalculationExecutionCodeCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetCalculationExecutionCodeCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1107,34 +671,9 @@ export const de_GetCalculationExecutionCodeCommand = async (output, context) =>
     };
     return response;
 };
-const de_GetCalculationExecutionCodeCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetCalculationExecutionStatusCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetCalculationExecutionStatusCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1145,34 +684,9 @@ export const de_GetCalculationExecutionStatusCommand = async (output, context) =
     };
     return response;
 };
-const de_GetCalculationExecutionStatusCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetCapacityAssignmentConfigurationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetCapacityAssignmentConfigurationCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1183,31 +697,9 @@ export const de_GetCapacityAssignmentConfigurationCommand = async (output, conte
     };
     return response;
 };
-const de_GetCapacityAssignmentConfigurationCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetCapacityReservationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetCapacityReservationCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1218,31 +710,9 @@ export const de_GetCapacityReservationCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetCapacityReservationCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetDatabaseCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetDatabaseCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1253,34 +723,9 @@ export const de_GetDatabaseCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetDatabaseCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "MetadataException":
-        case "com.amazonaws.athena#MetadataException":
-            throw await de_MetadataExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetDataCatalogCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetDataCatalogCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1291,31 +736,9 @@ export const de_GetDataCatalogCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetDataCatalogCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetNamedQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetNamedQueryCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1326,31 +749,9 @@ export const de_GetNamedQueryCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetNamedQueryCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetNotebookMetadataCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetNotebookMetadataCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1361,34 +762,9 @@ export const de_GetNotebookMetadataCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetNotebookMetadataCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetPreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetPreparedStatementCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1399,34 +775,9 @@ export const de_GetPreparedStatementCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetPreparedStatementCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetQueryExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetQueryExecutionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1437,31 +788,9 @@ export const de_GetQueryExecutionCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetQueryExecutionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetQueryResultsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetQueryResultsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1472,34 +801,9 @@ export const de_GetQueryResultsCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetQueryResultsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetQueryRuntimeStatisticsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetQueryRuntimeStatisticsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1510,31 +814,9 @@ export const de_GetQueryRuntimeStatisticsCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetQueryRuntimeStatisticsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetSessionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetSessionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1545,34 +827,9 @@ export const de_GetSessionCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetSessionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetSessionStatusCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetSessionStatusCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1583,34 +840,9 @@ export const de_GetSessionStatusCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetSessionStatusCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_GetTableMetadataCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_GetTableMetadataCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1621,69 +853,22 @@ export const de_GetTableMetadataCommand = async (output, context) => {
     };
     return response;
 };
-const de_GetTableMetadataCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "MetadataException":
-        case "com.amazonaws.athena#MetadataException":
-            throw await de_MetadataExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
-export const de_GetWorkGroupCommand = async (output, context) => {
-    if (output.statusCode >= 300) {
-        return de_GetWorkGroupCommandError(output, context);
-    }
-    const data = await parseBody(output.body, context);
-    let contents = {};
-    contents = de_GetWorkGroupOutput(data, context);
-    const response = {
-        $metadata: deserializeMetadata(output),
-        ...contents,
+export const de_GetWorkGroupCommand = async (output, context) => {
+    if (output.statusCode >= 300) {
+        return de_CommandError(output, context);
+    }
+    const data = await parseBody(output.body, context);
+    let contents = {};
+    contents = de_GetWorkGroupOutput(data, context);
+    const response = {
+        $metadata: deserializeMetadata(output),
+        ...contents,
     };
     return response;
 };
-const de_GetWorkGroupCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ImportNotebookCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ImportNotebookCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1694,34 +879,9 @@ export const de_ImportNotebookCommand = async (output, context) => {
     };
     return response;
 };
-const de_ImportNotebookCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListApplicationDPUSizesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListApplicationDPUSizesCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1732,34 +892,9 @@ export const de_ListApplicationDPUSizesCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListApplicationDPUSizesCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListCalculationExecutionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListCalculationExecutionsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1770,34 +905,9 @@ export const de_ListCalculationExecutionsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListCalculationExecutionsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListCapacityReservationsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListCapacityReservationsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1808,31 +918,9 @@ export const de_ListCapacityReservationsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListCapacityReservationsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListDatabasesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListDatabasesCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1843,34 +931,9 @@ export const de_ListDatabasesCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListDatabasesCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "MetadataException":
-        case "com.amazonaws.athena#MetadataException":
-            throw await de_MetadataExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListDataCatalogsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListDataCatalogsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1881,31 +944,9 @@ export const de_ListDataCatalogsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListDataCatalogsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListEngineVersionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListEngineVersionsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1916,31 +957,9 @@ export const de_ListEngineVersionsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListEngineVersionsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListExecutorsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListExecutorsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1951,34 +970,9 @@ export const de_ListExecutorsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListExecutorsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListNamedQueriesCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListNamedQueriesCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -1989,31 +983,9 @@ export const de_ListNamedQueriesCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListNamedQueriesCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListNotebookMetadataCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListNotebookMetadataCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2024,34 +996,9 @@ export const de_ListNotebookMetadataCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListNotebookMetadataCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListNotebookSessionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListNotebookSessionsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2062,34 +1009,9 @@ export const de_ListNotebookSessionsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListNotebookSessionsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListPreparedStatementsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListPreparedStatementsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2100,31 +1022,9 @@ export const de_ListPreparedStatementsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListPreparedStatementsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListQueryExecutionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListQueryExecutionsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2135,31 +1035,9 @@ export const de_ListQueryExecutionsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListQueryExecutionsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListSessionsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListSessionsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2170,34 +1048,9 @@ export const de_ListSessionsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListSessionsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListTableMetadataCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListTableMetadataCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2208,34 +1061,9 @@ export const de_ListTableMetadataCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListTableMetadataCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "MetadataException":
-        case "com.amazonaws.athena#MetadataException":
-            throw await de_MetadataExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListTagsForResourceCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2246,34 +1074,9 @@ export const de_ListTagsForResourceCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListTagsForResourceCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_ListWorkGroupsCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_ListWorkGroupsCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2284,31 +1087,9 @@ export const de_ListWorkGroupsCommand = async (output, context) => {
     };
     return response;
 };
-const de_ListWorkGroupsCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_PutCapacityAssignmentConfigurationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_PutCapacityAssignmentConfigurationCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2319,31 +1100,9 @@ export const de_PutCapacityAssignmentConfigurationCommand = async (output, conte
     };
     return response;
 };
-const de_PutCapacityAssignmentConfigurationCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_StartCalculationExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_StartCalculationExecutionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2354,34 +1113,9 @@ export const de_StartCalculationExecutionCommand = async (output, context) => {
     };
     return response;
 };
-const de_StartCalculationExecutionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_StartQueryExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_StartQueryExecutionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2392,116 +1126,22 @@ export const de_StartQueryExecutionCommand = async (output, context) => {
     };
     return response;
 };
-const de_StartQueryExecutionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_StartSessionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_StartSessionCommandError(output, context);
-    }
-    const data = await parseBody(output.body, context);
-    let contents = {};
-    contents = _json(data);
-    const response = {
-        $metadata: deserializeMetadata(output),
-        ...contents,
-    };
-    return response;
-};
-const de_StartSessionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        case "SessionAlreadyExistsException":
-        case "com.amazonaws.athena#SessionAlreadyExistsException":
-            throw await de_SessionAlreadyExistsExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
-export const de_StopCalculationExecutionCommand = async (output, context) => {
-    if (output.statusCode >= 300) {
-        return de_StopCalculationExecutionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
-    contents = _json(data);
-    const response = {
-        $metadata: deserializeMetadata(output),
-        ...contents,
-    };
-    return response;
-};
-const de_StopCalculationExecutionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
+    contents = _json(data);
+    const response = {
+        $metadata: deserializeMetadata(output),
+        ...contents,
+    };
+    return response;
 };
-export const de_StopQueryExecutionCommand = async (output, context) => {
+export const de_StopCalculationExecutionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_StopQueryExecutionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2512,31 +1152,22 @@ export const de_StopQueryExecutionCommand = async (output, context) => {
     };
     return response;
 };
-const de_StopQueryExecutionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
+export const de_StopQueryExecutionCommand = async (output, context) => {
+    if (output.statusCode >= 300) {
+        return de_CommandError(output, context);
     }
+    const data = await parseBody(output.body, context);
+    let contents = {};
+    contents = _json(data);
+    const response = {
+        $metadata: deserializeMetadata(output),
+        ...contents,
+    };
+    return response;
 };
 export const de_TagResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_TagResourceCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2547,34 +1178,9 @@ export const de_TagResourceCommand = async (output, context) => {
     };
     return response;
 };
-const de_TagResourceCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_TerminateSessionCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_TerminateSessionCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2585,34 +1191,9 @@ export const de_TerminateSessionCommand = async (output, context) => {
     };
     return response;
 };
-const de_TerminateSessionCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_UntagResourceCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_UntagResourceCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2623,34 +1204,9 @@ export const de_UntagResourceCommand = async (output, context) => {
     };
     return response;
 };
-const de_UntagResourceCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_UpdateCapacityReservationCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_UpdateCapacityReservationCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2661,31 +1217,9 @@ export const de_UpdateCapacityReservationCommand = async (output, context) => {
     };
     return response;
 };
-const de_UpdateCapacityReservationCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_UpdateDataCatalogCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_UpdateDataCatalogCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2696,31 +1230,9 @@ export const de_UpdateDataCatalogCommand = async (output, context) => {
     };
     return response;
 };
-const de_UpdateDataCatalogCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_UpdateNamedQueryCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_UpdateNamedQueryCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2731,31 +1243,9 @@ export const de_UpdateNamedQueryCommand = async (output, context) => {
     };
     return response;
 };
-const de_UpdateNamedQueryCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_UpdateNotebookCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_UpdateNotebookCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2766,34 +1256,9 @@ export const de_UpdateNotebookCommand = async (output, context) => {
     };
     return response;
 };
-const de_UpdateNotebookCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_UpdateNotebookMetadataCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_UpdateNotebookMetadataCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2804,34 +1269,9 @@ export const de_UpdateNotebookMetadataCommand = async (output, context) => {
     };
     return response;
 };
-const de_UpdateNotebookMetadataCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "TooManyRequestsException":
-        case "com.amazonaws.athena#TooManyRequestsException":
-            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_UpdatePreparedStatementCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_UpdatePreparedStatementCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2842,34 +1282,9 @@ export const de_UpdatePreparedStatementCommand = async (output, context) => {
     };
     return response;
 };
-const de_UpdatePreparedStatementCommandError = async (output, context) => {
-    const parsedOutput = {
-        ...output,
-        body: await parseErrorBody(output.body, context),
-    };
-    const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
-    switch (errorCode) {
-        case "InternalServerException":
-        case "com.amazonaws.athena#InternalServerException":
-            throw await de_InternalServerExceptionRes(parsedOutput, context);
-        case "InvalidRequestException":
-        case "com.amazonaws.athena#InvalidRequestException":
-            throw await de_InvalidRequestExceptionRes(parsedOutput, context);
-        case "ResourceNotFoundException":
-        case "com.amazonaws.athena#ResourceNotFoundException":
-            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
-        default:
-            const parsedBody = parsedOutput.body;
-            return throwDefaultError({
-                output,
-                parsedBody,
-                errorCode,
-            });
-    }
-};
 export const de_UpdateWorkGroupCommand = async (output, context) => {
     if (output.statusCode >= 300) {
-        return de_UpdateWorkGroupCommandError(output, context);
+        return de_CommandError(output, context);
     }
     const data = await parseBody(output.body, context);
     let contents = {};
@@ -2880,7 +1295,7 @@ export const de_UpdateWorkGroupCommand = async (output, context) => {
     };
     return response;
 };
-const de_UpdateWorkGroupCommandError = async (output, context) => {
+const de_CommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
         body: await parseErrorBody(output.body, context),
@@ -2893,6 +1308,18 @@ const de_UpdateWorkGroupCommandError = async (output, context) => {
         case "InvalidRequestException":
         case "com.amazonaws.athena#InvalidRequestException":
             throw await de_InvalidRequestExceptionRes(parsedOutput, context);
+        case "TooManyRequestsException":
+        case "com.amazonaws.athena#TooManyRequestsException":
+            throw await de_TooManyRequestsExceptionRes(parsedOutput, context);
+        case "ResourceNotFoundException":
+        case "com.amazonaws.athena#ResourceNotFoundException":
+            throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
+        case "MetadataException":
+        case "com.amazonaws.athena#MetadataException":
+            throw await de_MetadataExceptionRes(parsedOutput, context);
+        case "SessionAlreadyExistsException":
+        case "com.amazonaws.athena#SessionAlreadyExistsException":
+            throw await de_SessionAlreadyExistsExceptionRes(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
             return throwDefaultError({