@aws-sdk/client-workspaces-web 3.141.0 → 3.142.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,11 +1,11 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectInt32 as __expectInt32, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, parseEpochTimestamp as __parseEpochTimestamp, strictParseInt32 as __strictParseInt32, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectInt32 as __expectInt32, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, map as __map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, strictParseInt32 as __strictParseInt32, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
 import { AccessDeniedException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, TooManyTagsException, ValidationException, } from "../models/models_0";
 import { WorkSpacesWebServiceException as __BaseException } from "../models/WorkSpacesWebServiceException";
 export var serializeAws_restJson1AssociateBrowserSettingsCommand = 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()];
@@ -13,20 +13,10 @@ export var serializeAws_restJson1AssociateBrowserSettingsCommand = 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 || "") + "/portals/{portalArn+}/browserSettings";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
-                query = __assign({}, (input.browserSettingsArn !== undefined && { browserSettingsArn: input.browserSettingsArn }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
+                query = map({
+                    browserSettingsArn: [, input.browserSettingsArn],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -41,7 +31,7 @@ export var serializeAws_restJson1AssociateBrowserSettingsCommand = function (inp
     });
 }); };
 export var serializeAws_restJson1AssociateNetworkSettingsCommand = 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()];
@@ -49,20 +39,10 @@ export var serializeAws_restJson1AssociateNetworkSettingsCommand = 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 || "") + "/portals/{portalArn+}/networkSettings";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
-                query = __assign({}, (input.networkSettingsArn !== undefined && { networkSettingsArn: input.networkSettingsArn }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
+                query = map({
+                    networkSettingsArn: [, input.networkSettingsArn],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -77,7 +57,7 @@ export var serializeAws_restJson1AssociateNetworkSettingsCommand = function (inp
     });
 }); };
 export var serializeAws_restJson1AssociateTrustStoreCommand = 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()];
@@ -85,20 +65,10 @@ export var serializeAws_restJson1AssociateTrustStoreCommand = 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 || "") + "/portals/{portalArn+}/trustStores";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
-                query = __assign({}, (input.trustStoreArn !== undefined && { trustStoreArn: input.trustStoreArn }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
+                query = map({
+                    trustStoreArn: [, input.trustStoreArn],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -113,7 +83,7 @@ export var serializeAws_restJson1AssociateTrustStoreCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1AssociateUserSettingsCommand = 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()];
@@ -121,20 +91,10 @@ export var serializeAws_restJson1AssociateUserSettingsCommand = 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 || "") + "/portals/{portalArn+}/userSettings";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
-                query = __assign({}, (input.userSettingsArn !== undefined && { userSettingsArn: input.userSettingsArn }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
+                query = map({
+                    userSettingsArn: [, input.userSettingsArn],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -311,7 +271,7 @@ export var serializeAws_restJson1CreateUserSettingsCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1DeleteBrowserSettingsCommand = 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()];
@@ -319,19 +279,7 @@ export var serializeAws_restJson1DeleteBrowserSettingsCommand = 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 || "") + "/browserSettings/{browserSettingsArn+}";
-                if (input.browserSettingsArn !== undefined) {
-                    labelValue = input.browserSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: browserSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{browserSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: browserSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "browserSettingsArn", function () { return input.browserSettingsArn; }, "{browserSettingsArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -345,7 +293,7 @@ export var serializeAws_restJson1DeleteBrowserSettingsCommand = function (input,
     });
 }); };
 export var serializeAws_restJson1DeleteIdentityProviderCommand = 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()];
@@ -353,19 +301,7 @@ export var serializeAws_restJson1DeleteIdentityProviderCommand = 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 || "") + "/identityProviders/{identityProviderArn+}";
-                if (input.identityProviderArn !== undefined) {
-                    labelValue = input.identityProviderArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: identityProviderArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{identityProviderArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: identityProviderArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "identityProviderArn", function () { return input.identityProviderArn; }, "{identityProviderArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -379,7 +315,7 @@ export var serializeAws_restJson1DeleteIdentityProviderCommand = function (input
     });
 }); };
 export var serializeAws_restJson1DeleteNetworkSettingsCommand = 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()];
@@ -387,19 +323,7 @@ export var serializeAws_restJson1DeleteNetworkSettingsCommand = 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 || "") + "/networkSettings/{networkSettingsArn+}";
-                if (input.networkSettingsArn !== undefined) {
-                    labelValue = input.networkSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: networkSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{networkSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: networkSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "networkSettingsArn", function () { return input.networkSettingsArn; }, "{networkSettingsArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -413,7 +337,7 @@ export var serializeAws_restJson1DeleteNetworkSettingsCommand = function (input,
     });
 }); };
 export var serializeAws_restJson1DeletePortalCommand = 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()];
@@ -421,19 +345,7 @@ export var serializeAws_restJson1DeletePortalCommand = 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 || "") + "/portals/{portalArn+}";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -447,7 +359,7 @@ export var serializeAws_restJson1DeletePortalCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1DeleteTrustStoreCommand = 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()];
@@ -455,19 +367,7 @@ export var serializeAws_restJson1DeleteTrustStoreCommand = 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 || "") + "/trustStores/{trustStoreArn+}";
-                if (input.trustStoreArn !== undefined) {
-                    labelValue = input.trustStoreArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: trustStoreArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{trustStoreArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: trustStoreArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "trustStoreArn", function () { return input.trustStoreArn; }, "{trustStoreArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -481,7 +381,7 @@ export var serializeAws_restJson1DeleteTrustStoreCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1DeleteUserSettingsCommand = 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()];
@@ -489,19 +389,7 @@ export var serializeAws_restJson1DeleteUserSettingsCommand = 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 || "") + "/userSettings/{userSettingsArn+}";
-                if (input.userSettingsArn !== undefined) {
-                    labelValue = input.userSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: userSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{userSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: userSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "userSettingsArn", function () { return input.userSettingsArn; }, "{userSettingsArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -515,7 +403,7 @@ export var serializeAws_restJson1DeleteUserSettingsCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1DisassociateBrowserSettingsCommand = 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()];
@@ -523,19 +411,7 @@ export var serializeAws_restJson1DisassociateBrowserSettingsCommand = function (
                 _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 || "") + "/portals/{portalArn+}/browserSettings";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -549,7 +425,7 @@ export var serializeAws_restJson1DisassociateBrowserSettingsCommand = function (
     });
 }); };
 export var serializeAws_restJson1DisassociateNetworkSettingsCommand = 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()];
@@ -557,19 +433,7 @@ export var serializeAws_restJson1DisassociateNetworkSettingsCommand = function (
                 _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 || "") + "/portals/{portalArn+}/networkSettings";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -583,7 +447,7 @@ export var serializeAws_restJson1DisassociateNetworkSettingsCommand = function (
     });
 }); };
 export var serializeAws_restJson1DisassociateTrustStoreCommand = 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()];
@@ -591,19 +455,7 @@ export var serializeAws_restJson1DisassociateTrustStoreCommand = 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 || "") + "/portals/{portalArn+}/trustStores";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -617,7 +469,7 @@ export var serializeAws_restJson1DisassociateTrustStoreCommand = function (input
     });
 }); };
 export var serializeAws_restJson1DisassociateUserSettingsCommand = 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()];
@@ -625,19 +477,7 @@ export var serializeAws_restJson1DisassociateUserSettingsCommand = 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 || "") + "/portals/{portalArn+}/userSettings";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -651,7 +491,7 @@ export var serializeAws_restJson1DisassociateUserSettingsCommand = function (inp
     });
 }); };
 export var serializeAws_restJson1GetBrowserSettingsCommand = 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()];
@@ -659,19 +499,7 @@ export var serializeAws_restJson1GetBrowserSettingsCommand = 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 || "") + "/browserSettings/{browserSettingsArn+}";
-                if (input.browserSettingsArn !== undefined) {
-                    labelValue = input.browserSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: browserSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{browserSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: browserSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "browserSettingsArn", function () { return input.browserSettingsArn; }, "{browserSettingsArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -685,7 +513,7 @@ export var serializeAws_restJson1GetBrowserSettingsCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1GetIdentityProviderCommand = 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()];
@@ -693,19 +521,7 @@ export var serializeAws_restJson1GetIdentityProviderCommand = 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 || "") + "/identityProviders/{identityProviderArn+}";
-                if (input.identityProviderArn !== undefined) {
-                    labelValue = input.identityProviderArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: identityProviderArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{identityProviderArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: identityProviderArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "identityProviderArn", function () { return input.identityProviderArn; }, "{identityProviderArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -719,7 +535,7 @@ export var serializeAws_restJson1GetIdentityProviderCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1GetNetworkSettingsCommand = 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()];
@@ -727,19 +543,7 @@ export var serializeAws_restJson1GetNetworkSettingsCommand = 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 || "") + "/networkSettings/{networkSettingsArn+}";
-                if (input.networkSettingsArn !== undefined) {
-                    labelValue = input.networkSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: networkSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{networkSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: networkSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "networkSettingsArn", function () { return input.networkSettingsArn; }, "{networkSettingsArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -753,7 +557,7 @@ export var serializeAws_restJson1GetNetworkSettingsCommand = function (input, co
     });
 }); };
 export var serializeAws_restJson1GetPortalCommand = 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()];
@@ -761,19 +565,7 @@ export var serializeAws_restJson1GetPortalCommand = 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 || "") + "/portals/{portalArn+}";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -787,7 +579,7 @@ export var serializeAws_restJson1GetPortalCommand = function (input, context) {
     });
 }); };
 export var serializeAws_restJson1GetPortalServiceProviderMetadataCommand = 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()];
@@ -795,19 +587,7 @@ export var serializeAws_restJson1GetPortalServiceProviderMetadataCommand = funct
                 _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 || "") + "/portalIdp/{portalArn+}";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -821,7 +601,7 @@ export var serializeAws_restJson1GetPortalServiceProviderMetadataCommand = funct
     });
 }); };
 export var serializeAws_restJson1GetTrustStoreCommand = 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()];
@@ -829,19 +609,7 @@ export var serializeAws_restJson1GetTrustStoreCommand = 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 || "") + "/trustStores/{trustStoreArn+}";
-                if (input.trustStoreArn !== undefined) {
-                    labelValue = input.trustStoreArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: trustStoreArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{trustStoreArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: trustStoreArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "trustStoreArn", function () { return input.trustStoreArn; }, "{trustStoreArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -855,7 +623,7 @@ export var serializeAws_restJson1GetTrustStoreCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1GetTrustStoreCertificateCommand = 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()];
@@ -863,20 +631,10 @@ export var serializeAws_restJson1GetTrustStoreCertificateCommand = 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 || "") + "/trustStores/{trustStoreArn+}/certificate";
-                if (input.trustStoreArn !== undefined) {
-                    labelValue = input.trustStoreArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: trustStoreArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{trustStoreArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: trustStoreArn.");
-                }
-                query = __assign({}, (input.thumbprint !== undefined && { thumbprint: input.thumbprint }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "trustStoreArn", function () { return input.trustStoreArn; }, "{trustStoreArn+}", true);
+                query = map({
+                    thumbprint: [, input.thumbprint],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -891,7 +649,7 @@ export var serializeAws_restJson1GetTrustStoreCertificateCommand = function (inp
     });
 }); };
 export var serializeAws_restJson1GetUserSettingsCommand = 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()];
@@ -899,19 +657,7 @@ export var serializeAws_restJson1GetUserSettingsCommand = 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 || "") + "/userSettings/{userSettingsArn+}";
-                if (input.userSettingsArn !== undefined) {
-                    labelValue = input.userSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: userSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{userSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: userSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "userSettingsArn", function () { return input.userSettingsArn; }, "{userSettingsArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -933,7 +679,10 @@ export var serializeAws_restJson1ListBrowserSettingsCommand = 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 || "") + "/browserSettings";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -948,7 +697,7 @@ export var serializeAws_restJson1ListBrowserSettingsCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1ListIdentityProvidersCommand = 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()];
@@ -956,20 +705,11 @@ export var serializeAws_restJson1ListIdentityProvidersCommand = 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 || "") + "/portals/{portalArn+}/identityProviders";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -992,7 +732,10 @@ export var serializeAws_restJson1ListNetworkSettingsCommand = 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 || "") + "/networkSettings";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1015,7 +758,10 @@ export var serializeAws_restJson1ListPortalsCommand = 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 || "") + "/portals";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1030,7 +776,7 @@ export var serializeAws_restJson1ListPortalsCommand = function (input, context)
     });
 }); };
 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()];
@@ -1038,19 +784,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 || "") + "/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+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: resourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", function () { return input.resourceArn; }, "{resourceArn+}", true);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1064,7 +798,7 @@ export var serializeAws_restJson1ListTagsForResourceCommand = function (input, c
     });
 }); };
 export var serializeAws_restJson1ListTrustStoreCertificatesCommand = 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()];
@@ -1073,20 +807,11 @@ export var serializeAws_restJson1ListTrustStoreCertificatesCommand = function (i
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") +
                     "/trustStores/{trustStoreArn+}/certificates";
-                if (input.trustStoreArn !== undefined) {
-                    labelValue = input.trustStoreArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: trustStoreArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{trustStoreArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: trustStoreArn.");
-                }
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "trustStoreArn", function () { return input.trustStoreArn; }, "{trustStoreArn+}", true);
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1109,7 +834,10 @@ export var serializeAws_restJson1ListTrustStoresCommand = 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 || "") + "/trustStores";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1132,7 +860,10 @@ export var serializeAws_restJson1ListUserSettingsCommand = 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 || "") + "/userSettings";
-                query = __assign(__assign({}, (input.nextToken !== undefined && { nextToken: input.nextToken })), (input.maxResults !== undefined && { maxResults: input.maxResults.toString() }));
+                query = map({
+                    nextToken: [, input.nextToken],
+                    maxResults: [function () { return input.maxResults !== void 0; }, function () { return input.maxResults.toString(); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -1147,7 +878,7 @@ export var serializeAws_restJson1ListUserSettingsCommand = function (input, cont
     });
 }); };
 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;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1158,19 +889,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 || "") + "/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+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: resourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", function () { return input.resourceArn; }, "{resourceArn+}", true);
                 body = JSON.stringify(__assign({ clientToken: (_c = input.clientToken) !== null && _c !== void 0 ? _c : generateIdempotencyToken() }, (input.tags != null && { tags: serializeAws_restJson1TagList(input.tags, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1185,7 +904,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()];
@@ -1193,20 +912,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 || "") + "/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+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                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+}", true);
+                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,
@@ -1221,7 +930,7 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
     });
 }); };
 export var serializeAws_restJson1UpdateBrowserSettingsCommand = 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;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1232,19 +941,7 @@ export var serializeAws_restJson1UpdateBrowserSettingsCommand = function (input,
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/browserSettings/{browserSettingsArn+}";
-                if (input.browserSettingsArn !== undefined) {
-                    labelValue = input.browserSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: browserSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{browserSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: browserSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "browserSettingsArn", function () { return input.browserSettingsArn; }, "{browserSettingsArn+}", true);
                 body = JSON.stringify(__assign(__assign({}, (input.browserPolicy != null && { browserPolicy: input.browserPolicy })), { clientToken: (_c = input.clientToken) !== null && _c !== void 0 ? _c : generateIdempotencyToken() }));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1259,7 +956,7 @@ export var serializeAws_restJson1UpdateBrowserSettingsCommand = function (input,
     });
 }); };
 export var serializeAws_restJson1UpdateIdentityProviderCommand = 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;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1270,19 +967,7 @@ export var serializeAws_restJson1UpdateIdentityProviderCommand = function (input
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/identityProviders/{identityProviderArn+}";
-                if (input.identityProviderArn !== undefined) {
-                    labelValue = input.identityProviderArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: identityProviderArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{identityProviderArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: identityProviderArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "identityProviderArn", function () { return input.identityProviderArn; }, "{identityProviderArn+}", true);
                 body = JSON.stringify(__assign(__assign(__assign({ clientToken: (_c = input.clientToken) !== null && _c !== void 0 ? _c : generateIdempotencyToken() }, (input.identityProviderDetails != null && {
                     identityProviderDetails: serializeAws_restJson1IdentityProviderDetails(input.identityProviderDetails, context),
                 })), (input.identityProviderName != null && { identityProviderName: input.identityProviderName })), (input.identityProviderType != null && { identityProviderType: input.identityProviderType })));
@@ -1299,7 +984,7 @@ export var serializeAws_restJson1UpdateIdentityProviderCommand = function (input
     });
 }); };
 export var serializeAws_restJson1UpdateNetworkSettingsCommand = 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;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1310,19 +995,7 @@ export var serializeAws_restJson1UpdateNetworkSettingsCommand = function (input,
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/networkSettings/{networkSettingsArn+}";
-                if (input.networkSettingsArn !== undefined) {
-                    labelValue = input.networkSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: networkSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{networkSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: networkSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "networkSettingsArn", function () { return input.networkSettingsArn; }, "{networkSettingsArn+}", true);
                 body = JSON.stringify(__assign(__assign(__assign({ clientToken: (_c = input.clientToken) !== null && _c !== void 0 ? _c : generateIdempotencyToken() }, (input.securityGroupIds != null && {
                     securityGroupIds: serializeAws_restJson1SecurityGroupIdList(input.securityGroupIds, context),
                 })), (input.subnetIds != null && { subnetIds: serializeAws_restJson1SubnetIdList(input.subnetIds, context) })), (input.vpcId != null && { vpcId: input.vpcId })));
@@ -1339,7 +1012,7 @@ export var serializeAws_restJson1UpdateNetworkSettingsCommand = function (input,
     });
 }); };
 export var serializeAws_restJson1UpdatePortalCommand = 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()];
@@ -1349,19 +1022,7 @@ export var serializeAws_restJson1UpdatePortalCommand = function (input, context)
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/portals/{portalArn+}";
-                if (input.portalArn !== undefined) {
-                    labelValue = input.portalArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: portalArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{portalArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: portalArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "portalArn", function () { return input.portalArn; }, "{portalArn+}", true);
                 body = JSON.stringify(__assign({}, (input.displayName != null && { displayName: input.displayName })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -1376,7 +1037,7 @@ export var serializeAws_restJson1UpdatePortalCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1UpdateTrustStoreCommand = 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;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1387,19 +1048,7 @@ export var serializeAws_restJson1UpdateTrustStoreCommand = function (input, cont
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/trustStores/{trustStoreArn+}";
-                if (input.trustStoreArn !== undefined) {
-                    labelValue = input.trustStoreArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: trustStoreArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{trustStoreArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: trustStoreArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "trustStoreArn", function () { return input.trustStoreArn; }, "{trustStoreArn+}", true);
                 body = JSON.stringify(__assign(__assign(__assign({}, (input.certificatesToAdd != null && {
                     certificatesToAdd: serializeAws_restJson1CertificateList(input.certificatesToAdd, context),
                 })), (input.certificatesToDelete != null && {
@@ -1418,7 +1067,7 @@ export var serializeAws_restJson1UpdateTrustStoreCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1UpdateUserSettingsCommand = 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;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1429,19 +1078,7 @@ export var serializeAws_restJson1UpdateUserSettingsCommand = function (input, co
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/userSettings/{userSettingsArn+}";
-                if (input.userSettingsArn !== undefined) {
-                    labelValue = input.userSettingsArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: userSettingsArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{userSettingsArn+}", labelValue
-                        .split("/")
-                        .map(function (segment) { return __extendedEncodeURIComponent(segment); })
-                        .join("/"));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: userSettingsArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "userSettingsArn", function () { return input.userSettingsArn; }, "{userSettingsArn+}", true);
                 body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ clientToken: (_c = input.clientToken) !== null && _c !== void 0 ? _c : generateIdempotencyToken() }, (input.copyAllowed != null && { copyAllowed: input.copyAllowed })), (input.disconnectTimeoutInMinutes != null && { disconnectTimeoutInMinutes: input.disconnectTimeoutInMinutes })), (input.downloadAllowed != null && { downloadAllowed: input.downloadAllowed })), (input.idleDisconnectTimeoutInMinutes != null && {
                     idleDisconnectTimeoutInMinutes: input.idleDisconnectTimeoutInMinutes,
                 })), (input.pasteAllowed != null && { pasteAllowed: input.pasteAllowed })), (input.printAllowed != null && { printAllowed: input.printAllowed })), (input.uploadAllowed != null && { uploadAllowed: input.uploadAllowed })));
@@ -1465,28 +1102,26 @@ export var deserializeAws_restJson1AssociateBrowserSettingsCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AssociateBrowserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    browserSettingsArn: undefined,
-                    portalArn: 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.browserSettingsArn !== undefined && data.browserSettingsArn !== null) {
+                if (data.browserSettingsArn != null) {
                     contents.browserSettingsArn = __expectString(data.browserSettingsArn);
                 }
-                if (data.portalArn !== undefined && data.portalArn !== null) {
+                if (data.portalArn != null) {
                     contents.portalArn = __expectString(data.portalArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1AssociateBrowserSettingsCommandError = 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) {
@@ -1527,14 +1162,14 @@ var deserializeAws_restJson1AssociateBrowserSettingsCommandError = function (out
             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];
         }
     });
 }); };
@@ -1546,28 +1181,26 @@ export var deserializeAws_restJson1AssociateNetworkSettingsCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AssociateNetworkSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    networkSettingsArn: undefined,
-                    portalArn: 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.networkSettingsArn !== undefined && data.networkSettingsArn !== null) {
+                if (data.networkSettingsArn != null) {
                     contents.networkSettingsArn = __expectString(data.networkSettingsArn);
                 }
-                if (data.portalArn !== undefined && data.portalArn !== null) {
+                if (data.portalArn != null) {
                     contents.portalArn = __expectString(data.portalArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1AssociateNetworkSettingsCommandError = 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) {
@@ -1608,14 +1241,14 @@ var deserializeAws_restJson1AssociateNetworkSettingsCommandError = function (out
             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];
         }
     });
 }); };
@@ -1627,28 +1260,26 @@ export var deserializeAws_restJson1AssociateTrustStoreCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AssociateTrustStoreCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    portalArn: undefined,
-                    trustStoreArn: 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.portalArn !== undefined && data.portalArn !== null) {
+                if (data.portalArn != null) {
                     contents.portalArn = __expectString(data.portalArn);
                 }
-                if (data.trustStoreArn !== undefined && data.trustStoreArn !== null) {
+                if (data.trustStoreArn != null) {
                     contents.trustStoreArn = __expectString(data.trustStoreArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1AssociateTrustStoreCommandError = 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) {
@@ -1685,14 +1316,14 @@ var deserializeAws_restJson1AssociateTrustStoreCommandError = 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];
         }
     });
 }); };
@@ -1704,28 +1335,26 @@ export var deserializeAws_restJson1AssociateUserSettingsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AssociateUserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    portalArn: undefined,
-                    userSettingsArn: 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.portalArn !== undefined && data.portalArn !== null) {
+                if (data.portalArn != null) {
                     contents.portalArn = __expectString(data.portalArn);
                 }
-                if (data.userSettingsArn !== undefined && data.userSettingsArn !== null) {
+                if (data.userSettingsArn != null) {
                     contents.userSettingsArn = __expectString(data.userSettingsArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1AssociateUserSettingsCommandError = 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) {
@@ -1766,14 +1395,14 @@ var deserializeAws_restJson1AssociateUserSettingsCommandError = 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];
         }
     });
 }); };
@@ -1785,24 +1414,23 @@ export var deserializeAws_restJson1CreateBrowserSettingsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateBrowserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    browserSettingsArn: 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.browserSettingsArn !== undefined && data.browserSettingsArn !== null) {
+                if (data.browserSettingsArn != null) {
                     contents.browserSettingsArn = __expectString(data.browserSettingsArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateBrowserSettingsCommandError = 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) {
@@ -1847,14 +1475,14 @@ var deserializeAws_restJson1CreateBrowserSettingsCommandError = 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];
         }
     });
 }); };
@@ -1866,24 +1494,23 @@ export var deserializeAws_restJson1CreateIdentityProviderCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateIdentityProviderCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    identityProviderArn: 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.identityProviderArn !== undefined && data.identityProviderArn !== null) {
+                if (data.identityProviderArn != null) {
                     contents.identityProviderArn = __expectString(data.identityProviderArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateIdentityProviderCommandError = 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) {
@@ -1928,14 +1555,14 @@ var deserializeAws_restJson1CreateIdentityProviderCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -1947,24 +1574,23 @@ export var deserializeAws_restJson1CreateNetworkSettingsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateNetworkSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    networkSettingsArn: 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.networkSettingsArn !== undefined && data.networkSettingsArn !== null) {
+                if (data.networkSettingsArn != null) {
                     contents.networkSettingsArn = __expectString(data.networkSettingsArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateNetworkSettingsCommandError = 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) {
@@ -2005,14 +1631,14 @@ var deserializeAws_restJson1CreateNetworkSettingsCommandError = 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];
         }
     });
 }); };
@@ -2024,28 +1650,26 @@ export var deserializeAws_restJson1CreatePortalCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreatePortalCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    portalArn: undefined,
-                    portalEndpoint: 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.portalArn !== undefined && data.portalArn !== null) {
+                if (data.portalArn != null) {
                     contents.portalArn = __expectString(data.portalArn);
                 }
-                if (data.portalEndpoint !== undefined && data.portalEndpoint !== null) {
+                if (data.portalEndpoint != null) {
                     contents.portalEndpoint = __expectString(data.portalEndpoint);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreatePortalCommandError = 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) {
@@ -2090,14 +1714,14 @@ var deserializeAws_restJson1CreatePortalCommandError = 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];
         }
     });
 }); };
@@ -2109,24 +1733,23 @@ export var deserializeAws_restJson1CreateTrustStoreCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateTrustStoreCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    trustStoreArn: 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.trustStoreArn !== undefined && data.trustStoreArn !== null) {
+                if (data.trustStoreArn != null) {
                     contents.trustStoreArn = __expectString(data.trustStoreArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateTrustStoreCommandError = 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) {
@@ -2167,14 +1790,14 @@ var deserializeAws_restJson1CreateTrustStoreCommandError = function (output, con
             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];
         }
     });
 }); };
@@ -2186,24 +1809,23 @@ export var deserializeAws_restJson1CreateUserSettingsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateUserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    userSettingsArn: 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.userSettingsArn !== undefined && data.userSettingsArn !== null) {
+                if (data.userSettingsArn != null) {
                     contents.userSettingsArn = __expectString(data.userSettingsArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateUserSettingsCommandError = 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) {
@@ -2244,14 +1866,14 @@ var deserializeAws_restJson1CreateUserSettingsCommandError = 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];
         }
     });
 }); };
@@ -2263,18 +1885,18 @@ export var deserializeAws_restJson1DeleteBrowserSettingsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteBrowserSettingsCommandError(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_restJson1DeleteBrowserSettingsCommandError = 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) {
@@ -2311,14 +1933,14 @@ var deserializeAws_restJson1DeleteBrowserSettingsCommandError = 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];
         }
     });
 }); };
@@ -2330,18 +1952,18 @@ export var deserializeAws_restJson1DeleteIdentityProviderCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteIdentityProviderCommandError(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_restJson1DeleteIdentityProviderCommandError = 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) {
@@ -2378,14 +2000,14 @@ var deserializeAws_restJson1DeleteIdentityProviderCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -2397,18 +2019,18 @@ export var deserializeAws_restJson1DeleteNetworkSettingsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteNetworkSettingsCommandError(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_restJson1DeleteNetworkSettingsCommandError = 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) {
@@ -2445,14 +2067,14 @@ var deserializeAws_restJson1DeleteNetworkSettingsCommandError = 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];
         }
     });
 }); };
@@ -2464,18 +2086,18 @@ export var deserializeAws_restJson1DeletePortalCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeletePortalCommandError(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_restJson1DeletePortalCommandError = 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) {
@@ -2512,14 +2134,14 @@ var deserializeAws_restJson1DeletePortalCommandError = function (output, context
             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];
         }
     });
 }); };
@@ -2531,18 +2153,18 @@ export var deserializeAws_restJson1DeleteTrustStoreCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteTrustStoreCommandError(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_restJson1DeleteTrustStoreCommandError = 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) {
@@ -2579,14 +2201,14 @@ var deserializeAws_restJson1DeleteTrustStoreCommandError = 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];
         }
     });
 }); };
@@ -2598,18 +2220,18 @@ export var deserializeAws_restJson1DeleteUserSettingsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteUserSettingsCommandError(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_restJson1DeleteUserSettingsCommandError = 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) {
@@ -2646,14 +2268,14 @@ var deserializeAws_restJson1DeleteUserSettingsCommandError = 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];
         }
     });
 }); };
@@ -2665,18 +2287,18 @@ export var deserializeAws_restJson1DisassociateBrowserSettingsCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateBrowserSettingsCommandError(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_restJson1DisassociateBrowserSettingsCommandError = 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) {
@@ -2713,14 +2335,14 @@ var deserializeAws_restJson1DisassociateBrowserSettingsCommandError = function (
             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];
         }
     });
 }); };
@@ -2732,18 +2354,18 @@ export var deserializeAws_restJson1DisassociateNetworkSettingsCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateNetworkSettingsCommandError(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_restJson1DisassociateNetworkSettingsCommandError = 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) {
@@ -2780,14 +2402,14 @@ var deserializeAws_restJson1DisassociateNetworkSettingsCommandError = function (
             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];
         }
     });
 }); };
@@ -2799,18 +2421,18 @@ export var deserializeAws_restJson1DisassociateTrustStoreCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateTrustStoreCommandError(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_restJson1DisassociateTrustStoreCommandError = 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) {
@@ -2847,14 +2469,14 @@ var deserializeAws_restJson1DisassociateTrustStoreCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -2866,18 +2488,18 @@ export var deserializeAws_restJson1DisassociateUserSettingsCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateUserSettingsCommandError(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_restJson1DisassociateUserSettingsCommandError = 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) {
@@ -2914,14 +2536,14 @@ var deserializeAws_restJson1DisassociateUserSettingsCommandError = 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];
         }
     });
 }); };
@@ -2933,24 +2555,23 @@ export var deserializeAws_restJson1GetBrowserSettingsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetBrowserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    browserSettings: 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.browserSettings !== undefined && data.browserSettings !== null) {
+                if (data.browserSettings != null) {
                     contents.browserSettings = deserializeAws_restJson1BrowserSettings(data.browserSettings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetBrowserSettingsCommandError = 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) {
@@ -2987,14 +2608,14 @@ var deserializeAws_restJson1GetBrowserSettingsCommandError = 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];
         }
     });
 }); };
@@ -3006,24 +2627,23 @@ export var deserializeAws_restJson1GetIdentityProviderCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetIdentityProviderCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    identityProvider: 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.identityProvider !== undefined && data.identityProvider !== null) {
+                if (data.identityProvider != null) {
                     contents.identityProvider = deserializeAws_restJson1IdentityProvider(data.identityProvider, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetIdentityProviderCommandError = 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) {
@@ -3060,14 +2680,14 @@ var deserializeAws_restJson1GetIdentityProviderCommandError = 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];
         }
     });
 }); };
@@ -3079,24 +2699,23 @@ export var deserializeAws_restJson1GetNetworkSettingsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetNetworkSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    networkSettings: 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.networkSettings !== undefined && data.networkSettings !== null) {
+                if (data.networkSettings != null) {
                     contents.networkSettings = deserializeAws_restJson1NetworkSettings(data.networkSettings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetNetworkSettingsCommandError = 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) {
@@ -3133,14 +2752,14 @@ var deserializeAws_restJson1GetNetworkSettingsCommandError = 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];
         }
     });
 }); };
@@ -3152,24 +2771,23 @@ export var deserializeAws_restJson1GetPortalCommand = function (output, context)
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetPortalCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    portal: 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.portal !== undefined && data.portal !== null) {
+                if (data.portal != null) {
                     contents.portal = deserializeAws_restJson1Portal(data.portal, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetPortalCommandError = 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) {
@@ -3206,14 +2824,14 @@ var deserializeAws_restJson1GetPortalCommandError = function (output, context) {
             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];
         }
     });
 }); };
@@ -3225,28 +2843,26 @@ export var deserializeAws_restJson1GetPortalServiceProviderMetadataCommand = fun
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetPortalServiceProviderMetadataCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    portalArn: undefined,
-                    serviceProviderSamlMetadata: 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.portalArn !== undefined && data.portalArn !== null) {
+                if (data.portalArn != null) {
                     contents.portalArn = __expectString(data.portalArn);
                 }
-                if (data.serviceProviderSamlMetadata !== undefined && data.serviceProviderSamlMetadata !== null) {
+                if (data.serviceProviderSamlMetadata != null) {
                     contents.serviceProviderSamlMetadata = __expectString(data.serviceProviderSamlMetadata);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetPortalServiceProviderMetadataCommandError = 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) {
@@ -3283,14 +2899,14 @@ var deserializeAws_restJson1GetPortalServiceProviderMetadataCommandError = funct
             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];
         }
     });
 }); };
@@ -3302,24 +2918,23 @@ export var deserializeAws_restJson1GetTrustStoreCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetTrustStoreCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    trustStore: 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.trustStore !== undefined && data.trustStore !== null) {
+                if (data.trustStore != null) {
                     contents.trustStore = deserializeAws_restJson1TrustStore(data.trustStore, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetTrustStoreCommandError = 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) {
@@ -3356,14 +2971,14 @@ var deserializeAws_restJson1GetTrustStoreCommandError = function (output, contex
             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];
         }
     });
 }); };
@@ -3375,28 +2990,26 @@ export var deserializeAws_restJson1GetTrustStoreCertificateCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetTrustStoreCertificateCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    certificate: undefined,
-                    trustStoreArn: 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.certificate !== undefined && data.certificate !== null) {
+                if (data.certificate != null) {
                     contents.certificate = deserializeAws_restJson1Certificate(data.certificate, context);
                 }
-                if (data.trustStoreArn !== undefined && data.trustStoreArn !== null) {
+                if (data.trustStoreArn != null) {
                     contents.trustStoreArn = __expectString(data.trustStoreArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetTrustStoreCertificateCommandError = 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) {
@@ -3433,14 +3046,14 @@ var deserializeAws_restJson1GetTrustStoreCertificateCommandError = 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];
         }
     });
 }); };
@@ -3452,24 +3065,23 @@ export var deserializeAws_restJson1GetUserSettingsCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetUserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    userSettings: 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.userSettings !== undefined && data.userSettings !== null) {
+                if (data.userSettings != null) {
                     contents.userSettings = deserializeAws_restJson1UserSettings(data.userSettings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetUserSettingsCommandError = 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) {
@@ -3506,14 +3118,14 @@ var deserializeAws_restJson1GetUserSettingsCommandError = 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];
         }
     });
 }); };
@@ -3525,28 +3137,26 @@ export var deserializeAws_restJson1ListBrowserSettingsCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListBrowserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    browserSettings: 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.browserSettings !== undefined && data.browserSettings !== null) {
+                if (data.browserSettings != null) {
                     contents.browserSettings = deserializeAws_restJson1BrowserSettingsList(data.browserSettings, 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_restJson1ListBrowserSettingsCommandError = 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) {
@@ -3579,14 +3189,14 @@ var deserializeAws_restJson1ListBrowserSettingsCommandError = 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];
         }
     });
 }); };
@@ -3598,28 +3208,26 @@ export var deserializeAws_restJson1ListIdentityProvidersCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListIdentityProvidersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    identityProviders: 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.identityProviders !== undefined && data.identityProviders !== null) {
+                if (data.identityProviders != null) {
                     contents.identityProviders = deserializeAws_restJson1IdentityProviderList(data.identityProviders, 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_restJson1ListIdentityProvidersCommandError = 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) {
@@ -3652,14 +3260,14 @@ var deserializeAws_restJson1ListIdentityProvidersCommandError = 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];
         }
     });
 }); };
@@ -3671,28 +3279,26 @@ export var deserializeAws_restJson1ListNetworkSettingsCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListNetworkSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    networkSettings: 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.networkSettings !== undefined && data.networkSettings !== null) {
+                if (data.networkSettings != null) {
                     contents.networkSettings = deserializeAws_restJson1NetworkSettingsList(data.networkSettings, 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_restJson1ListNetworkSettingsCommandError = 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) {
@@ -3725,14 +3331,14 @@ var deserializeAws_restJson1ListNetworkSettingsCommandError = 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];
         }
     });
 }); };
@@ -3744,28 +3350,26 @@ export var deserializeAws_restJson1ListPortalsCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListPortalsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    portals: 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.portals !== undefined && data.portals !== null) {
+                if (data.portals != null) {
                     contents.portals = deserializeAws_restJson1PortalList(data.portals, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListPortalsCommandError = 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) {
@@ -3798,14 +3402,14 @@ var deserializeAws_restJson1ListPortalsCommandError = 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];
         }
     });
 }); };
@@ -3817,24 +3421,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_restJson1TagList(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) {
@@ -3871,14 +3474,14 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = 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];
         }
     });
 }); };
@@ -3890,32 +3493,29 @@ export var deserializeAws_restJson1ListTrustStoreCertificatesCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListTrustStoreCertificatesCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    certificateList: undefined,
-                    nextToken: undefined,
-                    trustStoreArn: 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.certificateList !== undefined && data.certificateList !== null) {
+                if (data.certificateList != null) {
                     contents.certificateList = deserializeAws_restJson1CertificateSummaryList(data.certificateList, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.trustStoreArn !== undefined && data.trustStoreArn !== null) {
+                if (data.trustStoreArn != null) {
                     contents.trustStoreArn = __expectString(data.trustStoreArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListTrustStoreCertificatesCommandError = 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) {
@@ -3952,14 +3552,14 @@ var deserializeAws_restJson1ListTrustStoreCertificatesCommandError = function (o
             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];
         }
     });
 }); };
@@ -3971,28 +3571,26 @@ export var deserializeAws_restJson1ListTrustStoresCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListTrustStoresCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    trustStores: 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.trustStores !== undefined && data.trustStores !== null) {
+                if (data.trustStores != null) {
                     contents.trustStores = deserializeAws_restJson1TrustStoreSummaryList(data.trustStores, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListTrustStoresCommandError = 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) {
@@ -4025,14 +3623,14 @@ var deserializeAws_restJson1ListTrustStoresCommandError = function (output, cont
             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];
         }
     });
 }); };
@@ -4044,28 +3642,26 @@ export var deserializeAws_restJson1ListUserSettingsCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListUserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    userSettings: 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.userSettings !== undefined && data.userSettings !== null) {
+                if (data.userSettings != null) {
                     contents.userSettings = deserializeAws_restJson1UserSettingsList(data.userSettings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListUserSettingsCommandError = 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) {
@@ -4098,14 +3694,14 @@ var deserializeAws_restJson1ListUserSettingsCommandError = function (output, con
             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];
         }
     });
 }); };
@@ -4117,18 +3713,18 @@ export var deserializeAws_restJson1TagResourceCommand = function (output, contex
                 if (output.statusCode !== 200 && 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) {
@@ -4169,14 +3765,14 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
             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];
         }
     });
 }); };
@@ -4188,18 +3784,18 @@ export var deserializeAws_restJson1UntagResourceCommand = function (output, cont
                 if (output.statusCode !== 200 && 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) {
@@ -4236,14 +3832,14 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
             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];
         }
     });
 }); };
@@ -4255,24 +3851,23 @@ export var deserializeAws_restJson1UpdateBrowserSettingsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateBrowserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    browserSettings: 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.browserSettings !== undefined && data.browserSettings !== null) {
+                if (data.browserSettings != null) {
                     contents.browserSettings = deserializeAws_restJson1BrowserSettings(data.browserSettings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateBrowserSettingsCommandError = 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) {
@@ -4309,14 +3904,14 @@ var deserializeAws_restJson1UpdateBrowserSettingsCommandError = 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];
         }
     });
 }); };
@@ -4328,24 +3923,23 @@ export var deserializeAws_restJson1UpdateIdentityProviderCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateIdentityProviderCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    identityProvider: 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.identityProvider !== undefined && data.identityProvider !== null) {
+                if (data.identityProvider != null) {
                     contents.identityProvider = deserializeAws_restJson1IdentityProvider(data.identityProvider, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateIdentityProviderCommandError = 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) {
@@ -4382,14 +3976,14 @@ var deserializeAws_restJson1UpdateIdentityProviderCommandError = function (outpu
             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];
         }
     });
 }); };
@@ -4401,24 +3995,23 @@ export var deserializeAws_restJson1UpdateNetworkSettingsCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateNetworkSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    networkSettings: 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.networkSettings !== undefined && data.networkSettings !== null) {
+                if (data.networkSettings != null) {
                     contents.networkSettings = deserializeAws_restJson1NetworkSettings(data.networkSettings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateNetworkSettingsCommandError = 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) {
@@ -4455,14 +4048,14 @@ var deserializeAws_restJson1UpdateNetworkSettingsCommandError = 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];
         }
     });
 }); };
@@ -4474,24 +4067,23 @@ export var deserializeAws_restJson1UpdatePortalCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdatePortalCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    portal: 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.portal !== undefined && data.portal !== null) {
+                if (data.portal != null) {
                     contents.portal = deserializeAws_restJson1Portal(data.portal, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdatePortalCommandError = 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) {
@@ -4528,14 +4120,14 @@ var deserializeAws_restJson1UpdatePortalCommandError = function (output, context
             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];
         }
     });
 }); };
@@ -4547,24 +4139,23 @@ export var deserializeAws_restJson1UpdateTrustStoreCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateTrustStoreCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    trustStoreArn: 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.trustStoreArn !== undefined && data.trustStoreArn !== null) {
+                if (data.trustStoreArn != null) {
                     contents.trustStoreArn = __expectString(data.trustStoreArn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateTrustStoreCommandError = 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) {
@@ -4605,14 +4196,14 @@ var deserializeAws_restJson1UpdateTrustStoreCommandError = function (output, con
             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];
         }
     });
 }); };
@@ -4624,24 +4215,23 @@ export var deserializeAws_restJson1UpdateUserSettingsCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateUserSettingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    userSettings: 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.userSettings !== undefined && data.userSettings !== null) {
+                if (data.userSettings != null) {
                     contents.userSettings = deserializeAws_restJson1UserSettings(data.userSettings, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateUserSettingsCommandError = 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) {
@@ -4678,23 +4268,24 @@ var deserializeAws_restJson1UpdateUserSettingsCommandError = 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];
         }
     });
 }); };
+var map = __map;
 var deserializeAws_restJson1AccessDeniedExceptionResponse = 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.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new AccessDeniedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4704,15 +4295,15 @@ var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutp
 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.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.resourceId !== undefined && data.resourceId !== null) {
+        if (data.resourceId != null) {
             contents.resourceId = __expectString(data.resourceId);
         }
-        if (data.resourceType !== undefined && data.resourceType !== null) {
+        if (data.resourceType != null) {
             contents.resourceType = __expectString(data.resourceType);
         }
         exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4722,12 +4313,14 @@ var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
-        if (parsedOutput.headers["retry-after"] !== undefined) {
-            contents.retryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
-        }
+        contents = map({
+            retryAfterSeconds: [
+                function () { return void 0 !== parsedOutput.headers["retry-after"]; },
+                function () { return __strictParseInt32(parsedOutput.headers["retry-after"]); },
+            ],
+        });
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new InternalServerException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4737,15 +4330,15 @@ var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOu
 var deserializeAws_restJson1ResourceNotFoundExceptionResponse = 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.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.resourceId !== undefined && data.resourceId !== null) {
+        if (data.resourceId != null) {
             contents.resourceId = __expectString(data.resourceId);
         }
-        if (data.resourceType !== undefined && data.resourceType !== null) {
+        if (data.resourceType != null) {
             contents.resourceType = __expectString(data.resourceType);
         }
         exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4755,21 +4348,21 @@ var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsed
 var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = 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.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.quotaCode !== undefined && data.quotaCode !== null) {
+        if (data.quotaCode != null) {
             contents.quotaCode = __expectString(data.quotaCode);
         }
-        if (data.resourceId !== undefined && data.resourceId !== null) {
+        if (data.resourceId != null) {
             contents.resourceId = __expectString(data.resourceId);
         }
-        if (data.resourceType !== undefined && data.resourceType !== null) {
+        if (data.resourceType != null) {
             contents.resourceType = __expectString(data.resourceType);
         }
-        if (data.serviceCode !== undefined && data.serviceCode !== null) {
+        if (data.serviceCode != null) {
             contents.serviceCode = __expectString(data.serviceCode);
         }
         exception = new ServiceQuotaExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4779,18 +4372,20 @@ var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = function (pa
 var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
-        if (parsedOutput.headers["retry-after"] !== undefined) {
-            contents.retryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
-        }
+        contents = map({
+            retryAfterSeconds: [
+                function () { return void 0 !== parsedOutput.headers["retry-after"]; },
+                function () { return __strictParseInt32(parsedOutput.headers["retry-after"]); },
+            ],
+        });
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.quotaCode !== undefined && data.quotaCode !== null) {
+        if (data.quotaCode != null) {
             contents.quotaCode = __expectString(data.quotaCode);
         }
-        if (data.serviceCode !== undefined && data.serviceCode !== null) {
+        if (data.serviceCode != null) {
             contents.serviceCode = __expectString(data.serviceCode);
         }
         exception = new ThrottlingException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4800,12 +4395,12 @@ var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput
 var deserializeAws_restJson1TooManyTagsExceptionResponse = 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.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.resourceName !== undefined && data.resourceName !== null) {
+        if (data.resourceName != null) {
             contents.resourceName = __expectString(data.resourceName);
         }
         exception = new TooManyTagsException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4815,15 +4410,15 @@ var deserializeAws_restJson1TooManyTagsExceptionResponse = function (parsedOutpu
 var deserializeAws_restJson1ValidationExceptionResponse = 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.fieldList !== undefined && data.fieldList !== null) {
+        if (data.fieldList != null) {
             contents.fieldList = deserializeAws_restJson1ValidationExceptionFieldList(data.fieldList, context);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.reason !== undefined && data.reason !== null) {
+        if (data.reason != null) {
             contents.reason = __expectString(data.reason);
         }
         exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -4834,9 +4429,6 @@ var serializeAws_restJson1CertificateList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return context.base64Encoder(entry);
     });
 };
@@ -4844,9 +4436,6 @@ var serializeAws_restJson1CertificateThumbprintList = function (input, context)
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4874,9 +4463,6 @@ var serializeAws_restJson1SecurityGroupIdList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4884,9 +4470,6 @@ var serializeAws_restJson1SubnetIdList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -4897,9 +4480,6 @@ var serializeAws_restJson1TagList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1Tag(entry, context);
     });
 };