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

@aws-sdk/client-kafka 3.50.0 → 3.53.0

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

Files changed (71) hide show

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

@@ -4,6 +4,8 @@ exports.deserializeAws_restJson1ListClusterOperationsCommand = exports.deseriali
 exports.deserializeAws_restJson1UpdateSecurityCommand = exports.deserializeAws_restJson1UpdateMonitoringCommand = exports.deserializeAws_restJson1UpdateConnectivityCommand = exports.deserializeAws_restJson1UpdateConfigurationCommand = exports.deserializeAws_restJson1UpdateClusterKafkaVersionCommand = exports.deserializeAws_restJson1UpdateClusterConfigurationCommand = exports.deserializeAws_restJson1UpdateBrokerTypeCommand = exports.deserializeAws_restJson1UpdateBrokerStorageCommand = exports.deserializeAws_restJson1UpdateBrokerCountCommand = exports.deserializeAws_restJson1UntagResourceCommand = exports.deserializeAws_restJson1TagResourceCommand = exports.deserializeAws_restJson1RebootBrokerCommand = exports.deserializeAws_restJson1ListTagsForResourceCommand = exports.deserializeAws_restJson1ListScramSecretsCommand = exports.deserializeAws_restJson1ListNodesCommand = exports.deserializeAws_restJson1ListKafkaVersionsCommand = exports.deserializeAws_restJson1ListConfigurationsCommand = exports.deserializeAws_restJson1ListConfigurationRevisionsCommand = exports.deserializeAws_restJson1ListClustersV2Command = exports.deserializeAws_restJson1ListClustersCommand = void 0;
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
+const KafkaServiceException_1 = require("../models/KafkaServiceException");
+const models_0_1 = require("../models/models_0");
 const serializeAws_restJson1BatchAssociateScramSecretCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {
@@ -1111,75 +1113,34 @@ const deserializeAws_restJson1BatchAssociateScramSecretCommandError = async (out
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1BatchDisassociateScramSecretCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1211,75 +1172,34 @@ const deserializeAws_restJson1BatchDisassociateScramSecretCommandError = async (
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CreateClusterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1315,75 +1235,34 @@ const deserializeAws_restJson1CreateClusterCommandError = async (output, context
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.kafka#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CreateClusterV2Command = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1423,75 +1302,34 @@ const deserializeAws_restJson1CreateClusterV2CommandError = async (output, conte
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.kafka#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CreateConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1535,75 +1373,34 @@ const deserializeAws_restJson1CreateConfigurationCommandError = async (output, c
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.kafka#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeleteClusterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1635,51 +1432,25 @@ const deserializeAws_restJson1DeleteClusterCommandError = async (output, context
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeleteConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1711,51 +1482,25 @@ const deserializeAws_restJson1DeleteConfigurationCommandError = async (output, c
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeClusterCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1783,59 +1528,28 @@ const deserializeAws_restJson1DescribeClusterCommandError = async (output, conte
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeClusterOperationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1863,59 +1577,28 @@ const deserializeAws_restJson1DescribeClusterOperationCommandError = async (outp
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeClusterV2Command = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1943,59 +1626,28 @@ const deserializeAws_restJson1DescribeClusterV2CommandError = async (output, con
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2047,67 +1699,31 @@ const deserializeAws_restJson1DescribeConfigurationCommandError = async (output,
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeConfigurationRevisionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2151,67 +1767,31 @@ const deserializeAws_restJson1DescribeConfigurationRevisionCommandError = async
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetBootstrapBrokersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2263,59 +1843,28 @@ const deserializeAws_restJson1GetBootstrapBrokersCommandError = async (output, c
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.kafka#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetCompatibleKafkaVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2343,75 +1892,34 @@ const deserializeAws_restJson1GetCompatibleKafkaVersionsCommandError = async (ou
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListClusterOperationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2443,51 +1951,25 @@ const deserializeAws_restJson1ListClusterOperationsCommandError = async (output,
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListClustersCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2519,51 +2001,25 @@ const deserializeAws_restJson1ListClustersCommandError = async (output, context)
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListClustersV2Command = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2595,51 +2051,25 @@ const deserializeAws_restJson1ListClustersV2CommandError = async (output, contex
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListConfigurationRevisionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2671,67 +2101,31 @@ const deserializeAws_restJson1ListConfigurationRevisionsCommandError = async (ou
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListConfigurationsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2763,59 +2157,28 @@ const deserializeAws_restJson1ListConfigurationsCommandError = async (output, co
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListKafkaVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2847,51 +2210,25 @@ const deserializeAws_restJson1ListKafkaVersionsCommandError = async (output, con
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListNodesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2923,51 +2260,25 @@ const deserializeAws_restJson1ListNodesCommandError = async (output, context) =>
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListScramSecretsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2999,75 +2310,34 @@ const deserializeAws_restJson1ListScramSecretsCommandError = async (output, cont
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListTagsForResourceCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3095,43 +2365,22 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (output, c
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1RebootBrokerCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3163,75 +2412,34 @@ const deserializeAws_restJson1RebootBrokerCommandError = async (output, context)
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1TagResourceCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
@@ -3255,43 +2463,22 @@ const deserializeAws_restJson1TagResourceCommandError = async (output, context)
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UntagResourceCommand = async (output, context) => {
     if (output.statusCode !== 204 && output.statusCode >= 300) {
@@ -3315,43 +2502,22 @@ const deserializeAws_restJson1UntagResourceCommandError = async (output, context
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateBrokerCountCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3383,59 +2549,28 @@ const deserializeAws_restJson1UpdateBrokerCountCommandError = async (output, con
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateBrokerStorageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3467,59 +2602,28 @@ const deserializeAws_restJson1UpdateBrokerStorageCommandError = async (output, c
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateBrokerTypeCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3551,75 +2655,34 @@ const deserializeAws_restJson1UpdateBrokerTypeCommandError = async (output, cont
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateClusterConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3651,67 +2714,31 @@ const deserializeAws_restJson1UpdateClusterConfigurationCommandError = async (ou
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateClusterKafkaVersionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3743,75 +2770,34 @@ const deserializeAws_restJson1UpdateClusterKafkaVersionCommandError = async (out
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateConfigurationCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3843,67 +2829,31 @@ const deserializeAws_restJson1UpdateConfigurationCommandError = async (output, c
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateConnectivityCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3935,67 +2885,31 @@ const deserializeAws_restJson1UpdateConnectivityCommandError = async (output, co
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateMonitoringCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -4027,59 +2941,28 @@ const deserializeAws_restJson1UpdateMonitoringCommandError = async (output, cont
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateSecurityCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -4111,84 +2994,37 @@ const deserializeAws_restJson1UpdateSecurityCommandError = async (output, contex
     switch (errorCode) {
         case "BadRequestException":
         case "com.amazonaws.kafka#BadRequestException":
-            response = {
-                ...(await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BadRequestExceptionResponse(parsedOutput, context);
         case "ForbiddenException":
         case "com.amazonaws.kafka#ForbiddenException":
-            response = {
-                ...(await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ForbiddenExceptionResponse(parsedOutput, context);
         case "InternalServerErrorException":
         case "com.amazonaws.kafka#InternalServerErrorException":
-            response = {
-                ...(await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalServerErrorExceptionResponse(parsedOutput, context);
         case "NotFoundException":
         case "com.amazonaws.kafka#NotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1NotFoundExceptionResponse(parsedOutput, context);
         case "ServiceUnavailableException":
         case "com.amazonaws.kafka#ServiceUnavailableException":
-            response = {
-                ...(await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ServiceUnavailableExceptionResponse(parsedOutput, context);
         case "TooManyRequestsException":
         case "com.amazonaws.kafka#TooManyRequestsException":
-            response = {
-                ...(await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1TooManyRequestsExceptionResponse(parsedOutput, context);
         case "UnauthorizedException":
         case "com.amazonaws.kafka#UnauthorizedException":
-            response = {
-                ...(await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1UnauthorizedExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new KafkaServiceException_1.KafkaServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1BadRequestExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "BadRequestException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        InvalidParameter: undefined,
-        Message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
         contents.InvalidParameter = smithy_client_1.expectString(data.invalidParameter);
@@ -4196,16 +3032,14 @@ const deserializeAws_restJson1BadRequestExceptionResponse = async (parsedOutput,
     if (data.message !== undefined && data.message !== null) {
         contents.Message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.BadRequestException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ConflictException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        InvalidParameter: undefined,
-        Message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
         contents.InvalidParameter = smithy_client_1.expectString(data.invalidParameter);
@@ -4213,16 +3047,14 @@ const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, c
     if (data.message !== undefined && data.message !== null) {
         contents.Message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ConflictException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ForbiddenExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ForbiddenException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        InvalidParameter: undefined,
-        Message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
         contents.InvalidParameter = smithy_client_1.expectString(data.invalidParameter);
@@ -4230,16 +3062,14 @@ const deserializeAws_restJson1ForbiddenExceptionResponse = async (parsedOutput,
     if (data.message !== undefined && data.message !== null) {
         contents.Message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ForbiddenException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalServerErrorExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "InternalServerErrorException",
-        $fault: "server",
-        $metadata: deserializeMetadata(parsedOutput),
-        InvalidParameter: undefined,
-        Message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
         contents.InvalidParameter = smithy_client_1.expectString(data.invalidParameter);
@@ -4247,16 +3077,14 @@ const deserializeAws_restJson1InternalServerErrorExceptionResponse = async (pars
     if (data.message !== undefined && data.message !== null) {
         contents.Message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.InternalServerErrorException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1NotFoundExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "NotFoundException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        InvalidParameter: undefined,
-        Message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
         contents.InvalidParameter = smithy_client_1.expectString(data.invalidParameter);
@@ -4264,16 +3092,14 @@ const deserializeAws_restJson1NotFoundExceptionResponse = async (parsedOutput, c
     if (data.message !== undefined && data.message !== null) {
         contents.Message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.NotFoundException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ServiceUnavailableExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ServiceUnavailableException",
-        $fault: "server",
-        $metadata: deserializeMetadata(parsedOutput),
-        InvalidParameter: undefined,
-        Message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
         contents.InvalidParameter = smithy_client_1.expectString(data.invalidParameter);
@@ -4281,16 +3107,14 @@ const deserializeAws_restJson1ServiceUnavailableExceptionResponse = async (parse
     if (data.message !== undefined && data.message !== null) {
         contents.Message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ServiceUnavailableException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1TooManyRequestsExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "TooManyRequestsException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        InvalidParameter: undefined,
-        Message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
         contents.InvalidParameter = smithy_client_1.expectString(data.invalidParameter);
@@ -4298,16 +3122,14 @@ const deserializeAws_restJson1TooManyRequestsExceptionResponse = async (parsedOu
     if (data.message !== undefined && data.message !== null) {
         contents.Message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.TooManyRequestsException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1UnauthorizedExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "UnauthorizedException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        InvalidParameter: undefined,
-        Message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
         contents.InvalidParameter = smithy_client_1.expectString(data.invalidParameter);
@@ -4315,7 +3137,11 @@ const deserializeAws_restJson1UnauthorizedExceptionResponse = async (parsedOutpu
     if (data.message !== undefined && data.message !== null) {
         contents.Message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.UnauthorizedException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const serializeAws_restJson1__listOf__string = (input, context) => {
     return input
@@ -4624,7 +3450,7 @@ const serializeAws_restJson1VpcConfig = (input, context) => {
     };
 };
 const deserializeAws_restJson1__listOf__string = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4632,9 +3458,10 @@ const deserializeAws_restJson1__listOf__string = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfBrokerEBSVolumeInfo = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4642,9 +3469,10 @@ const deserializeAws_restJson1__listOfBrokerEBSVolumeInfo = (output, context) =>
         }
         return deserializeAws_restJson1BrokerEBSVolumeInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfCluster = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4652,9 +3480,10 @@ const deserializeAws_restJson1__listOfCluster = (output, context) => {
         }
         return deserializeAws_restJson1Cluster(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfClusterInfo = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4662,9 +3491,10 @@ const deserializeAws_restJson1__listOfClusterInfo = (output, context) => {
         }
         return deserializeAws_restJson1ClusterInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfClusterOperationInfo = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4672,9 +3502,10 @@ const deserializeAws_restJson1__listOfClusterOperationInfo = (output, context) =
         }
         return deserializeAws_restJson1ClusterOperationInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfClusterOperationStep = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4682,9 +3513,10 @@ const deserializeAws_restJson1__listOfClusterOperationStep = (output, context) =
         }
         return deserializeAws_restJson1ClusterOperationStep(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfCompatibleKafkaVersion = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4692,9 +3524,10 @@ const deserializeAws_restJson1__listOfCompatibleKafkaVersion = (output, context)
         }
         return deserializeAws_restJson1CompatibleKafkaVersion(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfConfiguration = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4702,9 +3535,10 @@ const deserializeAws_restJson1__listOfConfiguration = (output, context) => {
         }
         return deserializeAws_restJson1Configuration(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfConfigurationRevision = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4712,9 +3546,10 @@ const deserializeAws_restJson1__listOfConfigurationRevision = (output, context)
         }
         return deserializeAws_restJson1ConfigurationRevision(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfKafkaVersion = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4722,9 +3557,10 @@ const deserializeAws_restJson1__listOfKafkaVersion = (output, context) => {
         }
         return deserializeAws_restJson1KafkaVersion(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfNodeInfo = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4732,9 +3568,10 @@ const deserializeAws_restJson1__listOfNodeInfo = (output, context) => {
         }
         return deserializeAws_restJson1NodeInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfUnprocessedScramSecret = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4742,9 +3579,10 @@ const deserializeAws_restJson1__listOfUnprocessedScramSecret = (output, context)
         }
         return deserializeAws_restJson1UnprocessedScramSecret(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__listOfVpcConfig = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4752,6 +3590,7 @@ const deserializeAws_restJson1__listOfVpcConfig = (output, context) => {
         }
         return deserializeAws_restJson1VpcConfig(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1__mapOf__string = (output, context) => {
     return Object.entries(output).reduce((acc, [key, value]) => {