@aws-sdk/client-kafka 3.137.0 → 3.145.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,10 +1,10 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseRfc3339DateTime as __parseRfc3339DateTime, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, limitedParseDouble as __limitedParseDouble, map as __map, parseRfc3339DateTime as __parseRfc3339DateTime, resolvedPath as __resolvedPath, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { KafkaServiceException as __BaseException } from "../models/KafkaServiceException";
 import { BadRequestException, ConflictException, ForbiddenException, InternalServerErrorException, NotFoundException, ServiceUnavailableException, TooManyRequestsException, UnauthorizedException, } from "../models/models_0";
 export var serializeAws_restJson1BatchAssociateScramSecretCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -14,16 +14,7 @@ export var serializeAws_restJson1BatchAssociateScramSecretCommand = function (in
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/scram-secrets";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign({}, (input.SecretArnList != null && {
                     secretArnList: serializeAws_restJson1__listOf__string(input.SecretArnList, context),
                 })));
@@ -40,7 +31,7 @@ export var serializeAws_restJson1BatchAssociateScramSecretCommand = function (in
     });
 }); };
 export var serializeAws_restJson1BatchDisassociateScramSecretCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -50,16 +41,7 @@ export var serializeAws_restJson1BatchDisassociateScramSecretCommand = function
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/scram-secrets";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign({}, (input.SecretArnList != null && {
                     secretArnList: serializeAws_restJson1__listOf__string(input.SecretArnList, context),
                 })));
@@ -162,7 +144,7 @@ export var serializeAws_restJson1CreateConfigurationCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1DeleteClusterCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -170,17 +152,10 @@ export var serializeAws_restJson1DeleteClusterCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
-                query = __assign({}, (input.CurrentVersion !== undefined && { currentVersion: input.CurrentVersion }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
+                query = map({
+                    currentVersion: [, input.CurrentVersion],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -195,7 +170,7 @@ export var serializeAws_restJson1DeleteClusterCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1DeleteConfigurationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -203,16 +178,7 @@ export var serializeAws_restJson1DeleteConfigurationCommand = function (input, c
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/configurations/{Arn}";
-                if (input.Arn !== undefined) {
-                    labelValue = input.Arn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: Arn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{Arn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: Arn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "Arn", function () { return input.Arn; }, "{Arn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -226,7 +192,7 @@ export var serializeAws_restJson1DeleteConfigurationCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1DescribeClusterCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -234,16 +200,7 @@ export var serializeAws_restJson1DescribeClusterCommand = function (input, conte
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -257,7 +214,7 @@ export var serializeAws_restJson1DescribeClusterCommand = function (input, conte
     });
 }); };
 export var serializeAws_restJson1DescribeClusterOperationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -265,16 +222,7 @@ export var serializeAws_restJson1DescribeClusterOperationCommand = function (inp
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/operations/{ClusterOperationArn}";
-                if (input.ClusterOperationArn !== undefined) {
-                    labelValue = input.ClusterOperationArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterOperationArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterOperationArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterOperationArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterOperationArn", function () { return input.ClusterOperationArn; }, "{ClusterOperationArn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -288,7 +236,7 @@ export var serializeAws_restJson1DescribeClusterOperationCommand = function (inp
     });
 }); };
 export var serializeAws_restJson1DescribeClusterV2Command = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -296,16 +244,7 @@ export var serializeAws_restJson1DescribeClusterV2Command = function (input, con
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/api/v2/clusters/{ClusterArn}";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -319,7 +258,7 @@ export var serializeAws_restJson1DescribeClusterV2Command = function (input, con
     });
 }); };
 export var serializeAws_restJson1DescribeConfigurationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -327,16 +266,7 @@ export var serializeAws_restJson1DescribeConfigurationCommand = function (input,
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/configurations/{Arn}";
-                if (input.Arn !== undefined) {
-                    labelValue = input.Arn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: Arn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{Arn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: Arn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "Arn", function () { return input.Arn; }, "{Arn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -350,7 +280,7 @@ export var serializeAws_restJson1DescribeConfigurationCommand = function (input,
     });
 }); };
 export var serializeAws_restJson1DescribeConfigurationRevisionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -359,26 +289,8 @@ export var serializeAws_restJson1DescribeConfigurationRevisionCommand = function
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/configurations/{Arn}/revisions/{Revision}";
-                if (input.Arn !== undefined) {
-                    labelValue = input.Arn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: Arn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{Arn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: Arn.");
-                }
-                if (input.Revision !== undefined) {
-                    labelValue = input.Revision.toString();
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: Revision.");
-                    }
-                    resolvedPath = resolvedPath.replace("{Revision}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: Revision.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "Arn", function () { return input.Arn; }, "{Arn}", false);
+                resolvedPath = __resolvedPath(resolvedPath, input, "Revision", function () { return input.Revision.toString(); }, "{Revision}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -392,7 +304,7 @@ export var serializeAws_restJson1DescribeConfigurationRevisionCommand = function
     });
 }); };
 export var serializeAws_restJson1GetBootstrapBrokersCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -401,16 +313,7 @@ export var serializeAws_restJson1GetBootstrapBrokersCommand = function (input, c
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/v1/clusters/{ClusterArn}/bootstrap-brokers";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -432,7 +335,9 @@ export var serializeAws_restJson1GetCompatibleKafkaVersionsCommand = function (i
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/compatible-kafka-versions";
-                query = __assign({}, (input.ClusterArn !== undefined && { clusterArn: input.ClusterArn }));
+                query = map({
+                    clusterArn: [, input.ClusterArn],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -447,7 +352,7 @@ export var serializeAws_restJson1GetCompatibleKafkaVersionsCommand = function (i
     });
 }); };
 export var serializeAws_restJson1ListClusterOperationsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -455,17 +360,11 @@ export var serializeAws_restJson1ListClusterOperationsCommand = function (input,
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/operations";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -488,7 +387,11 @@ export var serializeAws_restJson1ListClustersCommand = function (input, context)
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters";
-                query = __assign(__assign(__assign({}, (input.ClusterNameFilter !== undefined && { clusterNameFilter: input.ClusterNameFilter })), (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                query = map({
+                    clusterNameFilter: [, input.ClusterNameFilter],
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -511,7 +414,12 @@ export var serializeAws_restJson1ListClustersV2Command = function (input, contex
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/api/v2/clusters";
-                query = __assign(__assign(__assign(__assign({}, (input.ClusterNameFilter !== undefined && { clusterNameFilter: input.ClusterNameFilter })), (input.ClusterTypeFilter !== undefined && { clusterTypeFilter: input.ClusterTypeFilter })), (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                query = map({
+                    clusterNameFilter: [, input.ClusterNameFilter],
+                    clusterTypeFilter: [, input.ClusterTypeFilter],
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -526,7 +434,7 @@ export var serializeAws_restJson1ListClustersV2Command = function (input, contex
     });
 }); };
 export var serializeAws_restJson1ListConfigurationRevisionsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -534,17 +442,11 @@ export var serializeAws_restJson1ListConfigurationRevisionsCommand = function (i
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/configurations/{Arn}/revisions";
-                if (input.Arn !== undefined) {
-                    labelValue = input.Arn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: Arn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{Arn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: Arn.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "Arn", function () { return input.Arn; }, "{Arn}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -567,7 +469,10 @@ export var serializeAws_restJson1ListConfigurationsCommand = function (input, co
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/configurations";
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -590,7 +495,10 @@ export var serializeAws_restJson1ListKafkaVersionsCommand = function (input, con
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/kafka-versions";
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -605,7 +513,7 @@ export var serializeAws_restJson1ListKafkaVersionsCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1ListNodesCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -613,17 +521,11 @@ export var serializeAws_restJson1ListNodesCommand = function (input, context) {
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/nodes";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -638,7 +540,7 @@ export var serializeAws_restJson1ListNodesCommand = function (input, context) {
     });
 }); };
 export var serializeAws_restJson1ListScramSecretsCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -646,17 +548,11 @@ export var serializeAws_restJson1ListScramSecretsCommand = function (input, cont
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/scram-secrets";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
-                query = __assign(__assign({}, (input.MaxResults !== undefined && { maxResults: input.MaxResults.toString() })), (input.NextToken !== undefined && { nextToken: input.NextToken }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
+                query = map({
+                    maxResults: [function () { return input.MaxResults !== void 0; }, function () { return input.MaxResults.toString(); }],
+                    nextToken: [, input.NextToken],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -671,7 +567,7 @@ export var serializeAws_restJson1ListScramSecretsCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1ListTagsForResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -679,16 +575,7 @@ export var serializeAws_restJson1ListTagsForResourceCommand = function (input, c
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/tags/{ResourceArn}";
-                if (input.ResourceArn !== undefined) {
-                    labelValue = input.ResourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ResourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ResourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ResourceArn", function () { return input.ResourceArn; }, "{ResourceArn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -702,7 +589,7 @@ export var serializeAws_restJson1ListTagsForResourceCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1RebootBrokerCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -712,16 +599,7 @@ export var serializeAws_restJson1RebootBrokerCommand = function (input, context)
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/reboot-broker";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign({}, (input.BrokerIds != null && { brokerIds: serializeAws_restJson1__listOf__string(input.BrokerIds, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -736,7 +614,7 @@ export var serializeAws_restJson1RebootBrokerCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1TagResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -746,16 +624,7 @@ export var serializeAws_restJson1TagResourceCommand = function (input, context)
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/tags/{ResourceArn}";
-                if (input.ResourceArn !== undefined) {
-                    labelValue = input.ResourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ResourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ResourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ResourceArn", function () { return input.ResourceArn; }, "{ResourceArn}", false);
                 body = JSON.stringify(__assign({}, (input.Tags != null && { tags: serializeAws_restJson1__mapOf__string(input.Tags, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -770,7 +639,7 @@ export var serializeAws_restJson1TagResourceCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1UntagResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -778,17 +647,10 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/tags/{ResourceArn}";
-                if (input.ResourceArn !== undefined) {
-                    labelValue = input.ResourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ResourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ResourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ResourceArn.");
-                }
-                query = __assign({}, (input.TagKeys !== undefined && { tagKeys: (input.TagKeys || []).map(function (_entry) { return _entry; }) }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "ResourceArn", function () { return input.ResourceArn; }, "{ResourceArn}", false);
+                query = map({
+                    tagKeys: [function () { return input.TagKeys !== void 0; }, function () { return (input.TagKeys || []).map(function (_entry) { return _entry; }); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -803,7 +665,7 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1UpdateBrokerCountCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -813,16 +675,7 @@ export var serializeAws_restJson1UpdateBrokerCountCommand = function (input, con
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/nodes/count";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.CurrentVersion != null && { currentVersion: input.CurrentVersion })), (input.TargetNumberOfBrokerNodes != null && { targetNumberOfBrokerNodes: input.TargetNumberOfBrokerNodes })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -837,7 +690,7 @@ export var serializeAws_restJson1UpdateBrokerCountCommand = function (input, con
     });
 }); };
 export var serializeAws_restJson1UpdateBrokerStorageCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -847,16 +700,7 @@ export var serializeAws_restJson1UpdateBrokerStorageCommand = function (input, c
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/nodes/storage";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.CurrentVersion != null && { currentVersion: input.CurrentVersion })), (input.TargetBrokerEBSVolumeInfo != null && {
                     targetBrokerEBSVolumeInfo: serializeAws_restJson1__listOfBrokerEBSVolumeInfo(input.TargetBrokerEBSVolumeInfo, context),
                 })));
@@ -873,7 +717,7 @@ export var serializeAws_restJson1UpdateBrokerStorageCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1UpdateBrokerTypeCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -883,16 +727,7 @@ export var serializeAws_restJson1UpdateBrokerTypeCommand = function (input, cont
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/nodes/type";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.CurrentVersion != null && { currentVersion: input.CurrentVersion })), (input.TargetInstanceType != null && { targetInstanceType: input.TargetInstanceType })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -907,7 +742,7 @@ export var serializeAws_restJson1UpdateBrokerTypeCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1UpdateClusterConfigurationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -917,16 +752,7 @@ export var serializeAws_restJson1UpdateClusterConfigurationCommand = function (i
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/configuration";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.ConfigurationInfo != null && {
                     configurationInfo: serializeAws_restJson1ConfigurationInfo(input.ConfigurationInfo, context),
                 })), (input.CurrentVersion != null && { currentVersion: input.CurrentVersion })));
@@ -943,7 +769,7 @@ export var serializeAws_restJson1UpdateClusterConfigurationCommand = function (i
     });
 }); };
 export var serializeAws_restJson1UpdateClusterKafkaVersionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -953,16 +779,7 @@ export var serializeAws_restJson1UpdateClusterKafkaVersionCommand = function (in
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/version";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign(__assign(__assign({}, (input.ConfigurationInfo != null && {
                     configurationInfo: serializeAws_restJson1ConfigurationInfo(input.ConfigurationInfo, context),
                 })), (input.CurrentVersion != null && { currentVersion: input.CurrentVersion })), (input.TargetKafkaVersion != null && { targetKafkaVersion: input.TargetKafkaVersion })));
@@ -979,7 +796,7 @@ export var serializeAws_restJson1UpdateClusterKafkaVersionCommand = function (in
     });
 }); };
 export var serializeAws_restJson1UpdateConfigurationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -989,16 +806,7 @@ export var serializeAws_restJson1UpdateConfigurationCommand = function (input, c
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/configurations/{Arn}";
-                if (input.Arn !== undefined) {
-                    labelValue = input.Arn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: Arn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{Arn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: Arn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "Arn", function () { return input.Arn; }, "{Arn}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.Description != null && { description: input.Description })), (input.ServerProperties != null && { serverProperties: context.base64Encoder(input.ServerProperties) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1013,7 +821,7 @@ export var serializeAws_restJson1UpdateConfigurationCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1UpdateConnectivityCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1023,16 +831,7 @@ export var serializeAws_restJson1UpdateConnectivityCommand = function (input, co
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/connectivity";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign(__assign({}, (input.ConnectivityInfo != null && {
                     connectivityInfo: serializeAws_restJson1ConnectivityInfo(input.ConnectivityInfo, context),
                 })), (input.CurrentVersion != null && { currentVersion: input.CurrentVersion })));
@@ -1049,7 +848,7 @@ export var serializeAws_restJson1UpdateConnectivityCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1UpdateMonitoringCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1059,16 +858,7 @@ export var serializeAws_restJson1UpdateMonitoringCommand = function (input, cont
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/monitoring";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign(__assign(__assign(__assign({}, (input.CurrentVersion != null && { currentVersion: input.CurrentVersion })), (input.EnhancedMonitoring != null && { enhancedMonitoring: input.EnhancedMonitoring })), (input.LoggingInfo != null && { loggingInfo: serializeAws_restJson1LoggingInfo(input.LoggingInfo, context) })), (input.OpenMonitoring != null && {
                     openMonitoring: serializeAws_restJson1OpenMonitoringInfo(input.OpenMonitoring, context),
                 })));
@@ -1085,7 +875,7 @@ export var serializeAws_restJson1UpdateMonitoringCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1UpdateSecurityCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -1095,16 +885,7 @@ export var serializeAws_restJson1UpdateSecurityCommand = function (input, contex
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/v1/clusters/{ClusterArn}/security";
-                if (input.ClusterArn !== undefined) {
-                    labelValue = input.ClusterArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: ClusterArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{ClusterArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: ClusterArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "ClusterArn", function () { return input.ClusterArn; }, "{ClusterArn}", false);
                 body = JSON.stringify(__assign(__assign(__assign({}, (input.ClientAuthentication != null && {
                     clientAuthentication: serializeAws_restJson1ClientAuthentication(input.ClientAuthentication, context),
                 })), (input.CurrentVersion != null && { currentVersion: input.CurrentVersion })), (input.EncryptionInfo != null && {
@@ -1130,28 +911,26 @@ export var deserializeAws_restJson1BatchAssociateScramSecretCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchAssociateScramSecretCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    UnprocessedScramSecrets: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.unprocessedScramSecrets !== undefined && data.unprocessedScramSecrets !== null) {
+                if (data.unprocessedScramSecrets != null) {
                     contents.UnprocessedScramSecrets = deserializeAws_restJson1__listOfUnprocessedScramSecret(data.unprocessedScramSecrets, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchAssociateScramSecretCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1196,14 +975,14 @@ var deserializeAws_restJson1BatchAssociateScramSecretCommandError = function (ou
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1215,28 +994,26 @@ export var deserializeAws_restJson1BatchDisassociateScramSecretCommand = functio
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchDisassociateScramSecretCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    UnprocessedScramSecrets: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.unprocessedScramSecrets !== undefined && data.unprocessedScramSecrets !== null) {
+                if (data.unprocessedScramSecrets != null) {
                     contents.UnprocessedScramSecrets = deserializeAws_restJson1__listOfUnprocessedScramSecret(data.unprocessedScramSecrets, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchDisassociateScramSecretCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1281,14 +1058,14 @@ var deserializeAws_restJson1BatchDisassociateScramSecretCommandError = function
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1300,32 +1077,29 @@ export var deserializeAws_restJson1CreateClusterCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateClusterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterName: undefined,
-                    State: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterName !== undefined && data.clusterName !== null) {
+                if (data.clusterName != null) {
                     contents.ClusterName = __expectString(data.clusterName);
                 }
-                if (data.state !== undefined && data.state !== null) {
+                if (data.state != null) {
                     contents.State = __expectString(data.state);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateClusterCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1370,14 +1144,14 @@ var deserializeAws_restJson1CreateClusterCommandError = function (output, contex
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1389,36 +1163,32 @@ export var deserializeAws_restJson1CreateClusterV2Command = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateClusterV2CommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterName: undefined,
-                    ClusterType: undefined,
-                    State: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterName !== undefined && data.clusterName !== null) {
+                if (data.clusterName != null) {
                     contents.ClusterName = __expectString(data.clusterName);
                 }
-                if (data.clusterType !== undefined && data.clusterType !== null) {
+                if (data.clusterType != null) {
                     contents.ClusterType = __expectString(data.clusterType);
                 }
-                if (data.state !== undefined && data.state !== null) {
+                if (data.state != null) {
                     contents.State = __expectString(data.state);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateClusterV2CommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1463,14 +1233,14 @@ var deserializeAws_restJson1CreateClusterV2CommandError = function (output, cont
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1482,40 +1252,35 @@ export var deserializeAws_restJson1CreateConfigurationCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    CreationTime: undefined,
-                    LatestRevision: undefined,
-                    Name: undefined,
-                    State: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.Arn = __expectString(data.arn);
                 }
-                if (data.creationTime !== undefined && data.creationTime !== null) {
+                if (data.creationTime != null) {
                     contents.CreationTime = __expectNonNull(__parseRfc3339DateTime(data.creationTime));
                 }
-                if (data.latestRevision !== undefined && data.latestRevision !== null) {
+                if (data.latestRevision != null) {
                     contents.LatestRevision = deserializeAws_restJson1ConfigurationRevision(data.latestRevision, context);
                 }
-                if (data.name !== undefined && data.name !== null) {
+                if (data.name != null) {
                     contents.Name = __expectString(data.name);
                 }
-                if (data.state !== undefined && data.state !== null) {
+                if (data.state != null) {
                     contents.State = __expectString(data.state);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1560,14 +1325,14 @@ var deserializeAws_restJson1CreateConfigurationCommandError = function (output,
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -1579,28 +1344,26 @@ export var deserializeAws_restJson1DeleteClusterCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteClusterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    State: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.state !== undefined && data.state !== null) {
+                if (data.state != null) {
                     contents.State = __expectString(data.state);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteClusterCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1633,14 +1396,14 @@ var deserializeAws_restJson1DeleteClusterCommandError = function (output, contex
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1652,28 +1415,26 @@ export var deserializeAws_restJson1DeleteConfigurationCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    State: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.Arn = __expectString(data.arn);
                 }
-                if (data.state !== undefined && data.state !== null) {
+                if (data.state != null) {
                     contents.State = __expectString(data.state);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1706,14 +1467,14 @@ var deserializeAws_restJson1DeleteConfigurationCommandError = function (output,
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1725,24 +1486,23 @@ export var deserializeAws_restJson1DescribeClusterCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeClusterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterInfo: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterInfo !== undefined && data.clusterInfo !== null) {
+                if (data.clusterInfo != null) {
                     contents.ClusterInfo = deserializeAws_restJson1ClusterInfo(data.clusterInfo, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeClusterCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1779,14 +1539,14 @@ var deserializeAws_restJson1DescribeClusterCommandError = function (output, cont
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1798,24 +1558,23 @@ export var deserializeAws_restJson1DescribeClusterOperationCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeClusterOperationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterOperationInfo: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterOperationInfo !== undefined && data.clusterOperationInfo !== null) {
+                if (data.clusterOperationInfo != null) {
                     contents.ClusterOperationInfo = deserializeAws_restJson1ClusterOperationInfo(data.clusterOperationInfo, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeClusterOperationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1852,14 +1611,14 @@ var deserializeAws_restJson1DescribeClusterOperationCommandError = function (out
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1871,24 +1630,23 @@ export var deserializeAws_restJson1DescribeClusterV2Command = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeClusterV2CommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterInfo: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterInfo !== undefined && data.clusterInfo !== null) {
+                if (data.clusterInfo != null) {
                     contents.ClusterInfo = deserializeAws_restJson1Cluster(data.clusterInfo, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeClusterV2CommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1925,14 +1683,14 @@ var deserializeAws_restJson1DescribeClusterV2CommandError = function (output, co
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1944,48 +1702,41 @@ export var deserializeAws_restJson1DescribeConfigurationCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    CreationTime: undefined,
-                    Description: undefined,
-                    KafkaVersions: undefined,
-                    LatestRevision: undefined,
-                    Name: undefined,
-                    State: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.Arn = __expectString(data.arn);
                 }
-                if (data.creationTime !== undefined && data.creationTime !== null) {
+                if (data.creationTime != null) {
                     contents.CreationTime = __expectNonNull(__parseRfc3339DateTime(data.creationTime));
                 }
-                if (data.description !== undefined && data.description !== null) {
+                if (data.description != null) {
                     contents.Description = __expectString(data.description);
                 }
-                if (data.kafkaVersions !== undefined && data.kafkaVersions !== null) {
+                if (data.kafkaVersions != null) {
                     contents.KafkaVersions = deserializeAws_restJson1__listOf__string(data.kafkaVersions, context);
                 }
-                if (data.latestRevision !== undefined && data.latestRevision !== null) {
+                if (data.latestRevision != null) {
                     contents.LatestRevision = deserializeAws_restJson1ConfigurationRevision(data.latestRevision, context);
                 }
-                if (data.name !== undefined && data.name !== null) {
+                if (data.name != null) {
                     contents.Name = __expectString(data.name);
                 }
-                if (data.state !== undefined && data.state !== null) {
+                if (data.state != null) {
                     contents.State = __expectString(data.state);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2026,14 +1777,14 @@ var deserializeAws_restJson1DescribeConfigurationCommandError = function (output
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2045,40 +1796,35 @@ export var deserializeAws_restJson1DescribeConfigurationRevisionCommand = functi
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeConfigurationRevisionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    CreationTime: undefined,
-                    Description: undefined,
-                    Revision: undefined,
-                    ServerProperties: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.Arn = __expectString(data.arn);
                 }
-                if (data.creationTime !== undefined && data.creationTime !== null) {
+                if (data.creationTime != null) {
                     contents.CreationTime = __expectNonNull(__parseRfc3339DateTime(data.creationTime));
                 }
-                if (data.description !== undefined && data.description !== null) {
+                if (data.description != null) {
                     contents.Description = __expectString(data.description);
                 }
-                if (data.revision !== undefined && data.revision !== null) {
+                if (data.revision != null) {
                     contents.Revision = __expectLong(data.revision);
                 }
-                if (data.serverProperties !== undefined && data.serverProperties !== null) {
+                if (data.serverProperties != null) {
                     contents.ServerProperties = context.base64Decoder(data.serverProperties);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeConfigurationRevisionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2119,14 +1865,14 @@ var deserializeAws_restJson1DescribeConfigurationRevisionCommandError = function
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2138,48 +1884,41 @@ export var deserializeAws_restJson1GetBootstrapBrokersCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetBootstrapBrokersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    BootstrapBrokerString: undefined,
-                    BootstrapBrokerStringPublicSaslIam: undefined,
-                    BootstrapBrokerStringPublicSaslScram: undefined,
-                    BootstrapBrokerStringPublicTls: undefined,
-                    BootstrapBrokerStringSaslIam: undefined,
-                    BootstrapBrokerStringSaslScram: undefined,
-                    BootstrapBrokerStringTls: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.bootstrapBrokerString !== undefined && data.bootstrapBrokerString !== null) {
+                if (data.bootstrapBrokerString != null) {
                     contents.BootstrapBrokerString = __expectString(data.bootstrapBrokerString);
                 }
-                if (data.bootstrapBrokerStringPublicSaslIam !== undefined && data.bootstrapBrokerStringPublicSaslIam !== null) {
+                if (data.bootstrapBrokerStringPublicSaslIam != null) {
                     contents.BootstrapBrokerStringPublicSaslIam = __expectString(data.bootstrapBrokerStringPublicSaslIam);
                 }
-                if (data.bootstrapBrokerStringPublicSaslScram !== undefined && data.bootstrapBrokerStringPublicSaslScram !== null) {
+                if (data.bootstrapBrokerStringPublicSaslScram != null) {
                     contents.BootstrapBrokerStringPublicSaslScram = __expectString(data.bootstrapBrokerStringPublicSaslScram);
                 }
-                if (data.bootstrapBrokerStringPublicTls !== undefined && data.bootstrapBrokerStringPublicTls !== null) {
+                if (data.bootstrapBrokerStringPublicTls != null) {
                     contents.BootstrapBrokerStringPublicTls = __expectString(data.bootstrapBrokerStringPublicTls);
                 }
-                if (data.bootstrapBrokerStringSaslIam !== undefined && data.bootstrapBrokerStringSaslIam !== null) {
+                if (data.bootstrapBrokerStringSaslIam != null) {
                     contents.BootstrapBrokerStringSaslIam = __expectString(data.bootstrapBrokerStringSaslIam);
                 }
-                if (data.bootstrapBrokerStringSaslScram !== undefined && data.bootstrapBrokerStringSaslScram !== null) {
+                if (data.bootstrapBrokerStringSaslScram != null) {
                     contents.BootstrapBrokerStringSaslScram = __expectString(data.bootstrapBrokerStringSaslScram);
                 }
-                if (data.bootstrapBrokerStringTls !== undefined && data.bootstrapBrokerStringTls !== null) {
+                if (data.bootstrapBrokerStringTls != null) {
                     contents.BootstrapBrokerStringTls = __expectString(data.bootstrapBrokerStringTls);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetBootstrapBrokersCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2216,14 +1955,14 @@ var deserializeAws_restJson1GetBootstrapBrokersCommandError = function (output,
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2235,24 +1974,23 @@ export var deserializeAws_restJson1GetCompatibleKafkaVersionsCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetCompatibleKafkaVersionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    CompatibleKafkaVersions: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.compatibleKafkaVersions !== undefined && data.compatibleKafkaVersions !== null) {
+                if (data.compatibleKafkaVersions != null) {
                     contents.CompatibleKafkaVersions = deserializeAws_restJson1__listOfCompatibleKafkaVersion(data.compatibleKafkaVersions, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetCompatibleKafkaVersionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2297,14 +2035,14 @@ var deserializeAws_restJson1GetCompatibleKafkaVersionsCommandError = function (o
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2316,28 +2054,26 @@ export var deserializeAws_restJson1ListClusterOperationsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListClusterOperationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterOperationInfoList: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterOperationInfoList !== undefined && data.clusterOperationInfoList !== null) {
+                if (data.clusterOperationInfoList != null) {
                     contents.ClusterOperationInfoList = deserializeAws_restJson1__listOfClusterOperationInfo(data.clusterOperationInfoList, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.NextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListClusterOperationsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2370,14 +2106,14 @@ var deserializeAws_restJson1ListClusterOperationsCommandError = function (output
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2389,28 +2125,26 @@ export var deserializeAws_restJson1ListClustersCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListClustersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterInfoList: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterInfoList !== undefined && data.clusterInfoList !== null) {
+                if (data.clusterInfoList != null) {
                     contents.ClusterInfoList = deserializeAws_restJson1__listOfClusterInfo(data.clusterInfoList, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.NextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListClustersCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2443,14 +2177,14 @@ var deserializeAws_restJson1ListClustersCommandError = function (output, context
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2462,28 +2196,26 @@ export var deserializeAws_restJson1ListClustersV2Command = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListClustersV2CommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterInfoList: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterInfoList !== undefined && data.clusterInfoList !== null) {
+                if (data.clusterInfoList != null) {
                     contents.ClusterInfoList = deserializeAws_restJson1__listOfCluster(data.clusterInfoList, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.NextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListClustersV2CommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2516,14 +2248,14 @@ var deserializeAws_restJson1ListClustersV2CommandError = function (output, conte
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2535,28 +2267,26 @@ export var deserializeAws_restJson1ListConfigurationRevisionsCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListConfigurationRevisionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    Revisions: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.NextToken = __expectString(data.nextToken);
                 }
-                if (data.revisions !== undefined && data.revisions !== null) {
+                if (data.revisions != null) {
                     contents.Revisions = deserializeAws_restJson1__listOfConfigurationRevision(data.revisions, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListConfigurationRevisionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2597,14 +2327,14 @@ var deserializeAws_restJson1ListConfigurationRevisionsCommandError = function (o
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -2616,28 +2346,26 @@ export var deserializeAws_restJson1ListConfigurationsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListConfigurationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Configurations: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.configurations !== undefined && data.configurations !== null) {
+                if (data.configurations != null) {
                     contents.Configurations = deserializeAws_restJson1__listOfConfiguration(data.configurations, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.NextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListConfigurationsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2674,14 +2402,14 @@ var deserializeAws_restJson1ListConfigurationsCommandError = function (output, c
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2693,28 +2421,26 @@ export var deserializeAws_restJson1ListKafkaVersionsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListKafkaVersionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    KafkaVersions: undefined,
-                    NextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.kafkaVersions !== undefined && data.kafkaVersions !== null) {
+                if (data.kafkaVersions != null) {
                     contents.KafkaVersions = deserializeAws_restJson1__listOfKafkaVersion(data.kafkaVersions, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.NextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListKafkaVersionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2747,14 +2473,14 @@ var deserializeAws_restJson1ListKafkaVersionsCommandError = function (output, co
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2766,28 +2492,26 @@ export var deserializeAws_restJson1ListNodesCommand = function (output, context)
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListNodesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    NodeInfoList: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.NextToken = __expectString(data.nextToken);
                 }
-                if (data.nodeInfoList !== undefined && data.nodeInfoList !== null) {
+                if (data.nodeInfoList != null) {
                     contents.NodeInfoList = deserializeAws_restJson1__listOfNodeInfo(data.nodeInfoList, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListNodesCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2820,14 +2544,14 @@ var deserializeAws_restJson1ListNodesCommandError = function (output, context) {
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2839,28 +2563,26 @@ export var deserializeAws_restJson1ListScramSecretsCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListScramSecretsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    NextToken: undefined,
-                    SecretArnList: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.NextToken = __expectString(data.nextToken);
                 }
-                if (data.secretArnList !== undefined && data.secretArnList !== null) {
+                if (data.secretArnList != null) {
                     contents.SecretArnList = deserializeAws_restJson1__listOf__string(data.secretArnList, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListScramSecretsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2905,14 +2627,14 @@ var deserializeAws_restJson1ListScramSecretsCommandError = function (output, con
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -2924,24 +2646,23 @@ export var deserializeAws_restJson1ListTagsForResourceCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListTagsForResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Tags: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.tags !== undefined && data.tags !== null) {
+                if (data.tags != null) {
                     contents.Tags = deserializeAws_restJson1__mapOf__string(data.tags, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2970,14 +2691,14 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -2989,28 +2710,26 @@ export var deserializeAws_restJson1RebootBrokerCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1RebootBrokerCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1RebootBrokerCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3055,14 +2774,14 @@ var deserializeAws_restJson1RebootBrokerCommandError = function (output, context
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3074,18 +2793,18 @@ export var deserializeAws_restJson1TagResourceCommand = function (output, contex
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1TagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1TagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3114,14 +2833,14 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -3133,18 +2852,18 @@ export var deserializeAws_restJson1UntagResourceCommand = function (output, cont
                 if (output.statusCode !== 204 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UntagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UntagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3173,14 +2892,14 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -3192,28 +2911,26 @@ export var deserializeAws_restJson1UpdateBrokerCountCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateBrokerCountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateBrokerCountCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3250,14 +2967,14 @@ var deserializeAws_restJson1UpdateBrokerCountCommandError = function (output, co
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3269,28 +2986,26 @@ export var deserializeAws_restJson1UpdateBrokerStorageCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateBrokerStorageCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateBrokerStorageCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3327,14 +3042,14 @@ var deserializeAws_restJson1UpdateBrokerStorageCommandError = function (output,
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3346,28 +3061,26 @@ export var deserializeAws_restJson1UpdateBrokerTypeCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateBrokerTypeCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateBrokerTypeCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3412,14 +3125,14 @@ var deserializeAws_restJson1UpdateBrokerTypeCommandError = function (output, con
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3431,28 +3144,26 @@ export var deserializeAws_restJson1UpdateClusterConfigurationCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateClusterConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateClusterConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3493,14 +3204,14 @@ var deserializeAws_restJson1UpdateClusterConfigurationCommandError = function (o
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -3512,28 +3223,26 @@ export var deserializeAws_restJson1UpdateClusterKafkaVersionCommand = function (
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateClusterKafkaVersionCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateClusterKafkaVersionCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3578,14 +3287,14 @@ var deserializeAws_restJson1UpdateClusterKafkaVersionCommandError = function (ou
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
@@ -3597,28 +3306,26 @@ export var deserializeAws_restJson1UpdateConfigurationCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    Arn: undefined,
-                    LatestRevision: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.Arn = __expectString(data.arn);
                 }
-                if (data.latestRevision !== undefined && data.latestRevision !== null) {
+                if (data.latestRevision != null) {
                     contents.LatestRevision = deserializeAws_restJson1ConfigurationRevision(data.latestRevision, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3659,14 +3366,14 @@ var deserializeAws_restJson1UpdateConfigurationCommandError = function (output,
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -3678,28 +3385,26 @@ export var deserializeAws_restJson1UpdateConnectivityCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateConnectivityCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateConnectivityCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3740,14 +3445,14 @@ var deserializeAws_restJson1UpdateConnectivityCommandError = function (output, c
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -3759,28 +3464,26 @@ export var deserializeAws_restJson1UpdateMonitoringCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateMonitoringCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateMonitoringCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3817,14 +3520,14 @@ var deserializeAws_restJson1UpdateMonitoringCommandError = function (output, con
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3836,28 +3539,26 @@ export var deserializeAws_restJson1UpdateSecurityCommand = function (output, con
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateSecurityCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ClusterArn: undefined,
-                    ClusterOperationArn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.clusterArn !== undefined && data.clusterArn !== null) {
+                if (data.clusterArn != null) {
                     contents.ClusterArn = __expectString(data.clusterArn);
                 }
-                if (data.clusterOperationArn !== undefined && data.clusterOperationArn !== null) {
+                if (data.clusterOperationArn != null) {
                     contents.ClusterOperationArn = __expectString(data.clusterOperationArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateSecurityCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3902,26 +3603,27 @@ var deserializeAws_restJson1UpdateSecurityCommandError = function (output, conte
             case 15: throw _d.sent();
             case 16:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 17;
+            case 17: return [2];
         }
     });
 }); };
+var map = __map;
 var deserializeAws_restJson1BadRequestExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
+        if (data.invalidParameter != null) {
             contents.InvalidParameter = __expectString(data.invalidParameter);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.Message = __expectString(data.message);
         }
         exception = new BadRequestException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3931,12 +3633,12 @@ var deserializeAws_restJson1BadRequestExceptionResponse = function (parsedOutput
 var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
+        if (data.invalidParameter != null) {
             contents.InvalidParameter = __expectString(data.invalidParameter);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.Message = __expectString(data.message);
         }
         exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3946,12 +3648,12 @@ var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1ForbiddenExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
+        if (data.invalidParameter != null) {
             contents.InvalidParameter = __expectString(data.invalidParameter);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.Message = __expectString(data.message);
         }
         exception = new ForbiddenException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3961,12 +3663,12 @@ var deserializeAws_restJson1ForbiddenExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1InternalServerErrorExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
+        if (data.invalidParameter != null) {
             contents.InvalidParameter = __expectString(data.invalidParameter);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.Message = __expectString(data.message);
         }
         exception = new InternalServerErrorException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3976,12 +3678,12 @@ var deserializeAws_restJson1InternalServerErrorExceptionResponse = function (par
 var deserializeAws_restJson1NotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
+        if (data.invalidParameter != null) {
             contents.InvalidParameter = __expectString(data.invalidParameter);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.Message = __expectString(data.message);
         }
         exception = new NotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3991,12 +3693,12 @@ var deserializeAws_restJson1NotFoundExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1ServiceUnavailableExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
+        if (data.invalidParameter != null) {
             contents.InvalidParameter = __expectString(data.invalidParameter);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.Message = __expectString(data.message);
         }
         exception = new ServiceUnavailableException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4006,12 +3708,12 @@ var deserializeAws_restJson1ServiceUnavailableExceptionResponse = function (pars
 var deserializeAws_restJson1TooManyRequestsExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
+        if (data.invalidParameter != null) {
             contents.InvalidParameter = __expectString(data.invalidParameter);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.Message = __expectString(data.message);
         }
         exception = new TooManyRequestsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4021,12 +3723,12 @@ var deserializeAws_restJson1TooManyRequestsExceptionResponse = function (parsedO
 var deserializeAws_restJson1UnauthorizedExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.invalidParameter !== undefined && data.invalidParameter !== null) {
+        if (data.invalidParameter != null) {
             contents.InvalidParameter = __expectString(data.invalidParameter);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.Message = __expectString(data.message);
         }
         exception = new UnauthorizedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4037,9 +3739,6 @@ var serializeAws_restJson1__listOf__string = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4047,9 +3746,6 @@ var serializeAws_restJson1__listOfBrokerEBSVolumeInfo = function (input, context
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1BrokerEBSVolumeInfo(entry, context);
     });
 };
@@ -4057,9 +3753,6 @@ var serializeAws_restJson1__listOfVpcConfig = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1VpcConfig(entry, context);
     });
 };