@azure/notification-hubs 1.0.0-alpha.20221003.1 → 1.0.0-alpha.20221013.2

package/dist/index.cjs

@@ -6,12 +6,15 @@ var coreRestPipeline = require('@azure/core-rest-pipeline');
 var crypto = require('crypto');
 var coreXml = require('@azure/core-xml');
 var coreClient = require('@azure/core-client');
+var abortController = require('@azure/abort-controller');
 var coreTracing = require('@azure/core-tracing');
 var tslib = require('tslib');
+var coreUtil = require('@azure/core-util');
+var uuid = require('uuid');
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-const SDK_VERSION = "1.0.0-beta.6";
+const SDK_VERSION = "1.0.0-beta.7";
 const JSON_CONTENT_TYPE = "application/json;charset=utf-8";
 const XML_CONTENT_TYPE = "application/xml";
 const STREAM_CONTENT_TYPE = "application/octet-stream";
@@ -179,9 +182,9 @@ class NotificationHubsServiceClient$1 extends coreClient.ServiceClient {
         this.baseUrl = parsedConnection.endpoint;
         this.sasTokenProvider = createTokenProviderFromConnection(parsedConnection.sharedAccessKey, parsedConnection.sharedAccessKeyName);
     }
-    async createHeaders(operationName) {
+    async createHeaders(operationName, rawHeaders) {
         const authorization = await this.sasTokenProvider.getToken(this.baseUrl);
-        const headers = coreRestPipeline.createHttpHeaders();
+        const headers = coreRestPipeline.createHttpHeaders(rawHeaders);
         headers.set("Authorization", authorization.token);
         headers.set("x-ms-version", API_VERSION);
         headers.set("x-ms-azsdk-telemetry", `class=NotificationHubsServiceClient;method=${operationName}`);
@@ -509,6 +512,82 @@ async function sendRequest(context, request, successStatusCode) {
     return response;
 }
 
+// Copyright (c) Microsoft Corporation.
+/**
+ * @internal
+ * Serializes a NotificationHubJob into an Atom XML entry.
+ * @param entry - The NotificationHubJob to turn into an Atom XML entry.
+ * @returns An Atom XML entry containing the notification hub job.
+ */
+function serializeNotificationHubJobEntry(entry) {
+    const job = {
+        Type: entry.type,
+        OutputContainerUri: { __cdata: entry.outputContainerUrl },
+        ImportFileUri: isDefined(entry.importFileUrl) ? { __cdata: entry.importFileUrl } : undefined,
+    };
+    const requestObject = serializeToAtomXmlRequest("NotificationHubJob", job);
+    return coreXml.stringifyXML(requestObject, { rootName: "entry", cdataPropName: "__cdata" });
+}
+/**
+ * Parses an Atom XML of an notification hub job entry.
+ * @param bodyText - The incoming Atom XML entry to parse into a notification hub job.
+ * @returns A parsed NotificationHubJob.
+ */
+async function parseNotificationHubJobEntry(bodyText) {
+    const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
+    const content = xml.entry.content.NotificationHubJob;
+    return createNotificationHubJob(content);
+}
+/**
+ * Parses an Atom XML feed of notification hub jobs.
+ * @param bodyText - The incoming Atom XML feed to parse into notification hub jobs.
+ * @returns A list of notification hub jobs.
+ */
+async function parseNotificationHubJobFeed(bodyText) {
+    const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
+    const results = [];
+    if (!isDefined(xml.feed.entry)) {
+        return results;
+    }
+    const entries = Array.isArray(xml.feed.entry) ? xml.feed.entry : [xml.feed.entry];
+    for (const item of entries) {
+        results.push(createNotificationHubJob(item.content.NotificationHubJob));
+    }
+    return results;
+}
+function createInputOutputProperties(content) {
+    const props = {};
+    const keyValues = content["d3p1:KeyValueOfstringstring"];
+    const keyValueArray = Array.isArray(keyValues) ? keyValues : [keyValues];
+    for (const item of keyValueArray) {
+        props[item["d3p1:Key"]] = item["d3p1:Value"];
+    }
+    return props;
+}
+function createNotificationHubJob(content) {
+    let outputProperties;
+    if (isDefined(content["OutputProperties"])) {
+        outputProperties = createInputOutputProperties(content["OutputProperties"]);
+    }
+    let inputProperties;
+    if (isDefined(content["InputProperties"])) {
+        inputProperties = createInputOutputProperties(content["InputProperties"]);
+    }
+    return {
+        jobId: getStringOrUndefined(content["JobId"]),
+        type: getString(content["Type"], "type"),
+        status: getStringOrUndefined(content["Status"]),
+        progress: getFloatOrUndefined(content["Progress"]),
+        outputContainerUrl: getString(content["OutputContainerUri"], "outputContainerUrl"),
+        importFileUrl: getStringOrUndefined(content["ImportFileUri"]),
+        failure: getStringOrUndefined(content["Failure"]),
+        createdAt: getDateOrUndefined(content["CreatedAt"]),
+        updatedAt: getDateOrUndefined(content["UpdatedAt"]),
+        inputProperties,
+        outputProperties,
+    };
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * A tracing client to handle spans.
@@ -521,7 +600,178 @@ const tracingClient = coreTracing.createTracingClient({
 });
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$i = "cancelScheduledNotification";
+const OPERATION_NAME$h = "getNotificationHubJob";
+/**
+ * Gets a Notification Hub Job by the ID.
+ * @param context - The Notification Hubs client.
+ * @param jobId - The Notification Hub Job ID.
+ * @param options - The operation options.
+ * @returns The Notification Hub Job with the matching ID.
+ */
+function getNotificationHubJob(context, jobId, options = {}) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$h}`, options, async (updatedOptions) => {
+        const endpoint = context.requestUrl();
+        endpoint.pathname += `/jobs/${jobId}`;
+        const headers = await context.createHeaders(OPERATION_NAME$h);
+        headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
+        const request = createRequest(endpoint, "GET", headers, updatedOptions);
+        const response = await sendRequest(context, request, 200);
+        return parseNotificationHubJobEntry(response.bodyAsText);
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+const OPERATION_NAME$g = "submitNotificationHubJob";
+/**
+ * Submits a Notification Hub Job.
+ * Note: this is available to Standard SKU namespace and above.
+ * @param context - The Notification Hubs client.
+ * @param job - The notification hub job to submit.
+ * @param options - The operation options.
+ * @returns The notification hub job details including job ID and status.
+ */
+function submitNotificationHubJob(context, job, options = {}) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$g}`, options, async (updatedOptions) => {
+        const endpoint = context.requestUrl();
+        endpoint.pathname += "/jobs";
+        const headers = await context.createHeaders(OPERATION_NAME$g);
+        headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
+        const request = createRequest(endpoint, "POST", headers, updatedOptions);
+        request.body = serializeNotificationHubJobEntry(job);
+        const response = await sendRequest(context, request, 201);
+        return parseNotificationHubJobEntry(response.bodyAsText);
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+/**
+ * Submits a Notification Hub job and creates a poller to poll for results.
+ * @param context - The Notification Hubs client.
+ * @param notificationHubJob - The Notification Hub import/export job to start.
+ * @param options - The operation options.
+ * @returns A poller which can be called to poll until completion of the job.
+ */
+async function beginSubmitNotificationHubJob(context, notificationHubJob, polledOperationOptions = {}) {
+    var _a;
+    let submittedJob = await submitNotificationHubJob(context, notificationHubJob, polledOperationOptions);
+    const state = {
+        status: "notStarted",
+    };
+    const progressCallbacks = new Map();
+    const processProgressCallbacks = async () => progressCallbacks.forEach((h) => h(state));
+    let resultPromise;
+    let cancelJob;
+    const abortController$1 = new abortController.AbortController();
+    const currentPollIntervalInMs = (_a = polledOperationOptions.updateIntervalInMs) !== null && _a !== void 0 ? _a : 2000;
+    const poller = {
+        async poll(options) {
+            submittedJob = await getNotificationHubJob(context, submittedJob.jobId, options);
+            if (submittedJob.status === "Running" || submittedJob.status === "Started") {
+                state.status = "running";
+            }
+            if (submittedJob.status === "Completed") {
+                state.status = "succeeded";
+                state.result = submittedJob;
+            }
+            if (submittedJob.status === "Failed") {
+                state.status = "failed";
+                state.error = new Error(submittedJob.failure);
+            }
+            await processProgressCallbacks();
+            if (state.status === "canceled") {
+                throw new Error("Operation was canceled");
+            }
+            if (state.status === "failed") {
+                throw state.error;
+            }
+        },
+        pollUntilDone(pollOptions) {
+            return (resultPromise !== null && resultPromise !== void 0 ? resultPromise : (resultPromise = (async () => {
+                const { abortSignal: inputAbortSignal } = pollOptions || {};
+                const { signal: abortSignal } = inputAbortSignal
+                    ? new abortController.AbortController([inputAbortSignal, abortController$1.signal])
+                    : abortController$1;
+                if (!poller.isDone()) {
+                    await poller.poll({ abortSignal });
+                    while (!poller.isDone()) {
+                        const delay = sleep(currentPollIntervalInMs, abortSignal);
+                        cancelJob = () => abortController$1.abort();
+                        await delay;
+                        await poller.poll({ abortSignal });
+                    }
+                }
+                switch (state.status) {
+                    case "succeeded": {
+                        return poller.getResult();
+                    }
+                    case "canceled": {
+                        throw new Error("Operation was canceled");
+                    }
+                    case "failed": {
+                        throw state.error;
+                    }
+                    case "notStarted":
+                    case "running": {
+                        // Unreachable
+                        throw new Error(`polling completed without succeeding or failing`);
+                    }
+                }
+            })().finally(() => {
+                resultPromise = undefined;
+            })));
+        },
+        onProgress(callback) {
+            const s = Symbol();
+            progressCallbacks.set(s, callback);
+            return () => progressCallbacks.delete(s);
+        },
+        isDone() {
+            return ["succeeded", "failed", "canceled"].includes(state.status);
+        },
+        stopPolling() {
+            abortController$1.abort();
+            cancelJob === null || cancelJob === void 0 ? void 0 : cancelJob();
+        },
+        isStopped() {
+            return resultPromise === undefined;
+        },
+        getOperationState() {
+            return state;
+        },
+        getResult() {
+            return state.result;
+        },
+        toString() {
+            return JSON.stringify({ state });
+        },
+    };
+    return poller;
+}
+const REJECTED_ERR = new Error("The operation has been aborted");
+function sleep(ms, signal) {
+    return new Promise((resolve, reject) => {
+        if (signal.aborted) {
+            reject(REJECTED_ERR);
+            return;
+        }
+        const id = setTimeout(() => {
+            signal.removeEventListener("abort", onAbort);
+            if (signal.aborted) {
+                reject(REJECTED_ERR);
+                return;
+            }
+            resolve();
+        }, ms);
+        signal.addEventListener("abort", onAbort, { once: true });
+        function onAbort() {
+            clearTimeout(id);
+            reject(REJECTED_ERR);
+        }
+    });
+}
+
+// Copyright (c) Microsoft Corporation.
+const OPERATION_NAME$f = "cancelScheduledNotification";
 /**
  * Cancels the scheduled notification with the given notification ID.
  * NOTE: This is only available in Standard SKU Azure Notification Hubs.
@@ -531,10 +781,10 @@ const OPERATION_NAME$i = "cancelScheduledNotification";
  * @returns A notification hub response with correlation ID and tracking ID.
  */
 function cancelScheduledNotification(context, notificationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$i}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$f}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/schedulednotifications/${notificationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$i);
+        const headers = await context.createHeaders(OPERATION_NAME$f);
         const request = createRequest(endpoint, "DELETE", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
         return parseNotificationSendResponse(response);
@@ -542,7 +792,7 @@ function cancelScheduledNotification(context, notificationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$h = "createOrUpdateInstallation";
+const OPERATION_NAME$e = "createOrUpdateInstallation";
 /**
  * Creates or overwrites an installation to a Notification Hub.
  * @param context - The Notification Hubs client.
@@ -551,10 +801,10 @@ const OPERATION_NAME$h = "createOrUpdateInstallation";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function createOrUpdateInstallation(context, installation, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$h}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$e}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installation.installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$h);
+        const headers = await context.createHeaders(OPERATION_NAME$e);
         headers.set("Content-Type", "application/json");
         const request = createRequest(endpoint, "PUT", headers, updatedOptions);
         request.body = JSON.stringify(installation);
@@ -937,7 +1187,7 @@ async function createOrUpdateRegistrationDescription(context, registration, oper
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$g = "createOrUpdateRegistration";
+const OPERATION_NAME$d = "createOrUpdateRegistration";
 /**
  * Creates or updates a registration.
  * @param context - The Notification Hubs client.
@@ -946,13 +1196,13 @@ const OPERATION_NAME$g = "createOrUpdateRegistration";
  * @returns The created or updated registration description.
  */
 function createOrUpdateRegistration(context, registration, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$g}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$d}`, options, async (updatedOptions) => {
         return createOrUpdateRegistrationDescription(context, registration, "createOrUpdate", updatedOptions);
     });
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$f = "createRegistrationId";
+const OPERATION_NAME$c = "createRegistrationId";
 /**
  * Creates a new registration ID.
  * @param context - The Notification Hubs client.
@@ -960,10 +1210,10 @@ const OPERATION_NAME$f = "createRegistrationId";
  * @returns The newly created registration ID.
  */
 function createRegistrationId(context, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$f}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$c}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/registrationIDs";
-        const headers = await context.createHeaders(OPERATION_NAME$f);
+        const headers = await context.createHeaders(OPERATION_NAME$c);
         headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "POST", headers, updatedOptions);
         const response = await sendRequest(context, request, 201);
@@ -976,7 +1226,7 @@ function createRegistrationId(context, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$e = "createRegistration";
+const OPERATION_NAME$b = "createRegistration";
 /**
  * Creates a new registration. This method generates a registration ID,
  * which you can subsequently use to retrieve, update, and delete this registration.
@@ -986,7 +1236,7 @@ const OPERATION_NAME$e = "createRegistration";
  * @returns The newly created registration description.
  */
 function createRegistration(context, registration, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$e}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$b}`, options, async (updatedOptions) => {
         if (registration.registrationId) {
             throw new coreRestPipeline.RestError("registrationId must not be set during a create operation", {
                 statusCode: 400,
@@ -997,7 +1247,7 @@ function createRegistration(context, registration, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$d = "deleteInstallation";
+const OPERATION_NAME$a = "deleteInstallation";
 /**
  * Deletes an installation from a Notification Hub.
  * @param context - The Notification Hubs client.
@@ -1006,10 +1256,10 @@ const OPERATION_NAME$d = "deleteInstallation";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function deleteInstallation(context, installationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$d}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$a}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$d);
+        const headers = await context.createHeaders(OPERATION_NAME$a);
         const request = createRequest(endpoint, "DELETE", headers, updatedOptions);
         const response = await sendRequest(context, request, 204);
         return parseNotificationResponse(response);
@@ -1017,7 +1267,7 @@ function deleteInstallation(context, installationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$c = "deleteRegistration";
+const OPERATION_NAME$9 = "deleteRegistration";
 /**
  * Deletes a registration with the given registration ID.
  * @param context - The Notification Hubs client.
@@ -1026,10 +1276,10 @@ const OPERATION_NAME$c = "deleteRegistration";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function deleteRegistration(context, registrationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$c}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$9}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/registrations/${registrationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$c);
+        const headers = await context.createHeaders(OPERATION_NAME$9);
         headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
         headers.set("If-Match", isDefined(options.etag) ? `"${options.etag}"` : "*");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
@@ -1039,7 +1289,7 @@ function deleteRegistration(context, registrationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$b = "getFeedbackContainerUrl";
+const OPERATION_NAME$8 = "getFeedbackContainerUrl";
 /**
  * Retrieves an Azure Storage container URL. The container has feedback data for the notification hub.
  * The caller can then use the Azure Storage Services SDK to retrieve the contents of the container.
@@ -1048,10 +1298,10 @@ const OPERATION_NAME$b = "getFeedbackContainerUrl";
  * @returns The URL of the Azure Storage Container containing the feedback data.
  */
 function getFeedbackContainerUrl(context, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$b}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$8}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/feedbackcontainer";
-        const headers = await context.createHeaders(OPERATION_NAME$b);
+        const headers = await context.createHeaders(OPERATION_NAME$8);
         headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1060,7 +1310,7 @@ function getFeedbackContainerUrl(context, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$a = "getInstallation";
+const OPERATION_NAME$7 = "getInstallation";
 /**
  * Gets an Azure Notification Hub installation by the installation ID.
  * @param context - The Notification Hubs client.
@@ -1069,10 +1319,10 @@ const OPERATION_NAME$a = "getInstallation";
  * @returns The installation that matches the installation ID.
  */
 function getInstallation(context, installationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$a}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$7}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$a);
+        const headers = await context.createHeaders(OPERATION_NAME$7);
         headers.set("Content-Type", "application/json");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1080,101 +1330,6 @@ function getInstallation(context, installationId, options = {}) {
     });
 }
 
-// Copyright (c) Microsoft Corporation.
-/**
- * @internal
- * Serializes a NotificationHubJob into an Atom XML entry.
- * @param entry - The NotificationHubJob to turn into an Atom XML entry.
- * @returns An Atom XML entry containing the notification hub job.
- */
-function serializeNotificationHubJobEntry(entry) {
-    const job = {
-        Type: entry.type,
-        OutputContainerUri: { __cdata: entry.outputContainerUrl },
-        ImportFileUri: isDefined(entry.importFileUrl) ? { __cdata: entry.importFileUrl } : undefined,
-    };
-    const requestObject = serializeToAtomXmlRequest("NotificationHubJob", job);
-    return coreXml.stringifyXML(requestObject, { rootName: "entry", cdataPropName: "__cdata" });
-}
-/**
- * Parses an Atom XML of an notification hub job entry.
- * @param bodyText - The incoming Atom XML entry to parse into a notification hub job.
- * @returns A parsed NotificationHubJob.
- */
-async function parseNotificationHubJobEntry(bodyText) {
-    const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
-    const content = xml.entry.content.NotificationHubJob;
-    return createNotificationHubJob(content);
-}
-/**
- * Parses an Atom XML feed of notification hub jobs.
- * @param bodyText - The incoming Atom XML feed to parse into notification hub jobs.
- * @returns A list of notification hub jobs.
- */
-async function parseNotificationHubJobFeed(bodyText) {
-    const xml = await coreXml.parseXML(bodyText, { includeRoot: true });
-    const results = [];
-    if (!isDefined(xml.feed.entry)) {
-        return results;
-    }
-    const entries = Array.isArray(xml.feed.entry) ? xml.feed.entry : [xml.feed.entry];
-    for (const item of entries) {
-        results.push(createNotificationHubJob(item.content.NotificationHubJob));
-    }
-    return results;
-}
-function createInputOutputProperties(content) {
-    const props = {};
-    for (const item of content["d3p1:KeyValueOfstringstring"]) {
-        props[item["d3p1:Key"]] = item["d3p1:Value"];
-    }
-    return props;
-}
-function createNotificationHubJob(content) {
-    let outputProperties;
-    if (isDefined(content["OutputProperties"])) {
-        outputProperties = createInputOutputProperties(content["OutputProperties"]);
-    }
-    let inputProperties;
-    if (isDefined(content["InputProperties"])) {
-        inputProperties = createInputOutputProperties(content["InputProperties"]);
-    }
-    return {
-        jobId: getStringOrUndefined(content["JobId"]),
-        type: getString(content["Type"], "type"),
-        status: getStringOrUndefined(content["Status"]),
-        progress: getFloatOrUndefined(content["Progress"]),
-        outputContainerUrl: getString(content["OutputContainerUri"], "outputContainerUrl"),
-        importFileUrl: getStringOrUndefined(content["ImportFileUri"]),
-        failure: getStringOrUndefined(content["Failure"]),
-        createdAt: getDateOrUndefined(content["CreatedAt"]),
-        updatedAt: getDateOrUndefined(content["UpdatedAt"]),
-        inputProperties,
-        outputProperties,
-    };
-}
-
-// Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$9 = "getNotificationHubJob";
-/**
- * Gets a Notification Hub Job by the ID.
- * @param context - The Notification Hubs client.
- * @param jobId - The Notification Hub Job ID.
- * @param options - The operation options.
- * @returns The Notification Hub Job with the matching ID.
- */
-function getNotificationHubJob(context, jobId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$9}`, options, async (updatedOptions) => {
-        const endpoint = context.requestUrl();
-        endpoint.pathname += `/jobs/${jobId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$9);
-        headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
-        const request = createRequest(endpoint, "GET", headers, updatedOptions);
-        const response = await sendRequest(context, request, 200);
-        return parseNotificationHubJobEntry(response.bodyAsText);
-    });
-}
-
 // Copyright (c) Microsoft Corporation.
 /**
  * @internal
@@ -1223,15 +1378,16 @@ async function parseNotificationDetails(bodyText) {
     };
 }
 function parseOutcomeCounts(counts) {
+    const items = Array.isArray(counts) ? counts : [counts];
     const results = [];
-    for (const item of counts) {
+    for (const item of items) {
         results.push({ state: item["Name"], count: getInteger(item["Count"], "Count") });
     }
     return results;
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$8 = "getNotificationOutcomeDetails";
+const OPERATION_NAME$6 = "getNotificationOutcomeDetails";
 /**
  * Retrieves the results of a send operation. This can retrieve intermediate results if the send is being processed
  * or final results if the Send* has completed. This API can only be called for Standard SKU and above.
@@ -1241,10 +1397,10 @@ const OPERATION_NAME$8 = "getNotificationOutcomeDetails";
  * @returns The results of the send operation.
  */
 function getNotificationOutcomeDetails(context, notificationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$8}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$6}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/messages/${notificationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$8);
+        const headers = await context.createHeaders(OPERATION_NAME$6);
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
         return parseNotificationDetails(response.bodyAsText);
@@ -1252,7 +1408,7 @@ function getNotificationOutcomeDetails(context, notificationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$7 = "getRegistration";
+const OPERATION_NAME$5 = "getRegistration";
 /**
  * Gets a registration by the given registration ID.
  * @param context - The Notification Hubs client.
@@ -1261,10 +1417,10 @@ const OPERATION_NAME$7 = "getRegistration";
  * @returns A RegistrationDescription that has the given registration ID.
  */
 function getRegistration(context, registrationId, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$7}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$5}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/registrations/${registrationId}`;
-        const headers = await context.createHeaders(OPERATION_NAME$7);
+        const headers = await context.createHeaders(OPERATION_NAME$5);
         headers.set("Content-Type", "application/xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1273,7 +1429,7 @@ function getRegistration(context, registrationId, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$6 = "listNotificationHubJobs";
+const OPERATION_NAME$4 = "listNotificationHubJobs";
 /**
  * Gets all Notification Hub Jobs for this Notification Hub.
  * @param context - The Notification Hubs client.xs
@@ -1281,10 +1437,10 @@ const OPERATION_NAME$6 = "listNotificationHubJobs";
  * @returns An array of all Notification Hub Jobs for this Notification Hub.
  */
 function listNotificationHubJobs(context, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$6}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$4}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += "/jobs";
-        const headers = await context.createHeaders(OPERATION_NAME$6);
+        const headers = await context.createHeaders(OPERATION_NAME$4);
         headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
         const request = createRequest(endpoint, "GET", headers, updatedOptions);
         const response = await sendRequest(context, request, 200);
@@ -1293,7 +1449,7 @@ function listNotificationHubJobs(context, options = {}) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$5 = "listRegistrationsByTag";
+const OPERATION_NAME$3 = "listRegistrationsByTag";
 /**
  * Lists all registrations with the matching tag.
  * @param context - The Notification Hubs client.
@@ -1302,7 +1458,7 @@ const OPERATION_NAME$5 = "listRegistrationsByTag";
  * @returns A paged async iterable containing the matching registrations for the notification hub.
  */
 function listRegistrationsByTag(context, tag, options = {}) {
-    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext-${OPERATION_NAME$5}`, options);
+    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext.${OPERATION_NAME$3}`, options);
     try {
         const iter = listRegistrationsByTagAll(context, tag, updatedOptions);
         return {
@@ -1364,7 +1520,7 @@ async function _listRegistrationsByTag(context, tag, options, continuationToken)
     if (continuationToken !== undefined) {
         endpoint.searchParams.set("continuationtoken", continuationToken);
     }
-    const headers = await context.createHeaders(OPERATION_NAME$5);
+    const headers = await context.createHeaders(OPERATION_NAME$3);
     const request = createRequest(endpoint, "GET", headers, options);
     const response = await sendRequest(context, request, 200);
     const registrations = await registrationDescriptionParser.parseRegistrationFeed(response.bodyAsText);
@@ -1376,7 +1532,7 @@ async function _listRegistrationsByTag(context, tag, options, continuationToken)
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$4 = "listRegistrations";
+const OPERATION_NAME$2 = "listRegistrations";
 /**
  * Gets all registrations for the notification hub with the given query options.
  * @param context - The Notification Hubs client.
@@ -1384,7 +1540,7 @@ const OPERATION_NAME$4 = "listRegistrations";
  * @returns A paged async iterable containing all of the registrations for the notification hub.
  */
 function listRegistrations(context, options = {}) {
-    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext-${OPERATION_NAME$4}`, options);
+    const { span, updatedOptions } = tracingClient.startSpan(`NotificationHubsClientContext.${OPERATION_NAME$2}`, options);
     try {
         const iter = listRegistrationsAll(context, updatedOptions);
         return {
@@ -1449,7 +1605,7 @@ async function _listRegistrations(context, options, continuationToken) {
     if (continuationToken !== undefined) {
         endpoint.searchParams.set("continuationtoken", continuationToken);
     }
-    const headers = await context.createHeaders(OPERATION_NAME$4);
+    const headers = await context.createHeaders(OPERATION_NAME$2);
     const request = createRequest(endpoint, "GET", headers, options);
     const response = await sendRequest(context, request, 200);
     const registrations = await registrationDescriptionParser.parseRegistrationFeed(response.bodyAsText);
@@ -1461,53 +1617,28 @@ async function _listRegistrations(context, options, continuationToken) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$3 = "scheduleNotificationPayload";
+// Licensed under the MIT license.
 /**
  * @internal
  */
-function scheduleNotificationPayload(context, scheduledTime, tags, notification, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$3}`, options, async (updatedOptions) => {
-        const endpoint = context.requestUrl();
-        endpoint.pathname += "/schedulednotifications/";
-        const headers = await context.createHeaders(OPERATION_NAME$3);
-        if (notification.headers) {
-            for (const headerName of Object.keys(notification.headers)) {
-                headers.set(headerName, notification.headers[headerName]);
-            }
-        }
-        headers.set("ServiceBusNotification-ScheduleTime", scheduledTime.toISOString());
-        headers.set("Content-Type", notification.contentType);
-        headers.set("ServiceBusNotification-Format", notification.platform);
-        if (tags) {
-            let tagExpression = null;
-            if (Array.isArray(tags)) {
-                tagExpression = tags.join("||");
-            }
-            else {
-                tagExpression = tags;
-            }
-            headers.set("ServiceBusNotification-Tags", tagExpression);
-        }
-        const request = createRequest(endpoint, "POST", headers, updatedOptions);
-        request.body = notification.body;
-        const response = await sendRequest(context, request, 201);
-        return parseNotificationSendResponse(response);
-    });
+function createMultipartDirectNotification(boundaryName, notification, deviceHandles) {
+    return (`--${boundaryName}\r\n` +
+        `Content-type: ${notification.contentType}\r\n` +
+        "Content-Disposition: inline; name=notification\r\n\r\n" +
+        notification.body +
+        "\r\n" +
+        `--${boundaryName}\r\n` +
+        "Content-type: application/json\r\n" +
+        "Content-Disposition: inline; name=devices\r\n\r\n" +
+        JSON.stringify(deviceHandles) +
+        "\r\n" +
+        `--${boundaryName}--`);
 }
-
-// Copyright (c) Microsoft Corporation.
 /**
- * Schedules a push notification to all devices registered on the Notification Hub.
- * NOTE: This is only available in Standard SKU Azure Notification Hubs.
- * @param context - The Notification Hubs client.
- * @param scheduledTime - The Date to send the push notification.
- * @param notification - The notification to send to the matching devices.
- * @param options - Configuration options for the direct send operation which can contain custom headers
- * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
- * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
+ * @internal
  */
-function scheduleBroadcastNotification(context, scheduledTime, notification, options = {}) {
-    return scheduleNotificationPayload(context, scheduledTime, undefined, notification, options);
+function normalizeTags(tags) {
+    return Array.isArray(tags) ? tags.join("||") : tags;
 }
 
 // Copyright (c) Microsoft Corporation.
@@ -1516,56 +1647,20 @@ function scheduleBroadcastNotification(context, scheduledTime, notification, opt
  * NOTE: This is only available in Standard SKU Azure Notification Hubs.
  * @param context - The Notification Hubs client.
  * @param scheduledTime - The Date to send the push notification.
- * @param tags - The tags used to target the device for push notifications in either an array or tag expression.
  * @param notification - The notification to send to the matching devices.
- * @param options - Configuration options for the direct send operation which can contain custom headers
- * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
+ * @param options - Options which include tags used to target the device for push notifications in either an array or tag expression.
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
-function scheduleNotification(context, scheduledTime, tags, notification, options = {}) {
-    return scheduleNotificationPayload(context, scheduledTime, tags, notification, options);
-}
-
-// Copyright (c) Microsoft Corporation.
-/**
- * @internal
- */
-function sendNotificationPayload(context, notification, method, pushHandle, tags, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${method}`, options, async (updatedOptions) => {
+function scheduleNotification(context, scheduledTime, notification, options = {}) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.scheduleNotification`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
-        endpoint.pathname += "/messages/";
-        if (options.enableTestSend) {
-            endpoint.searchParams.append("test", "true");
-        }
-        const headers = await context.createHeaders(method);
-        if (notification.headers) {
-            for (const headerName of Object.keys(notification.headers)) {
-                headers.set(headerName, notification.headers[headerName]);
-            }
-        }
-        if (pushHandle) {
-            endpoint.searchParams.append("direct", "true");
-            if (notification.platform === "browser") {
-                const browserHandle = pushHandle;
-                headers.set("ServiceBusNotification-DeviceHandle", browserHandle.endpoint);
-                headers.set("Auth", browserHandle.auth);
-                headers.set("P256DH", browserHandle.p256dh);
-            }
-            else {
-                headers.set("ServiceBusNotification-DeviceHandle", pushHandle);
-            }
-        }
+        endpoint.pathname += "/schedulednotifications/";
+        const headers = await context.createHeaders("scheduleNotification", notification.headers);
+        headers.set("ServiceBusNotification-ScheduleTime", scheduledTime.toISOString());
         headers.set("Content-Type", notification.contentType);
         headers.set("ServiceBusNotification-Format", notification.platform);
-        if (tags) {
-            let tagExpression = null;
-            if (Array.isArray(tags)) {
-                tagExpression = tags.join("||");
-            }
-            else {
-                tagExpression = tags;
-            }
-            headers.set("ServiceBusNotification-Tags", tagExpression);
+        if (options.tags) {
+            headers.set("ServiceBusNotification-Tags", normalizeTags(options.tags));
         }
         const request = createRequest(endpoint, "POST", headers, updatedOptions);
         request.body = notification.body;
@@ -1576,64 +1671,76 @@ function sendNotificationPayload(context, notification, method, pushHandle, tags
 
 // Copyright (c) Microsoft Corporation.
 /**
- * Sends push notifications to all devices on the Notification Hub.
- * @param context - The Notification Hubs client.
- * @param notification - The notification to send to all devices.
- * @param options - Configuration options for the direct send operation which can contain custom headers
- * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
- * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
+ * Determines whether the options are of type SendNotificationOptions.
+ * @param options - The options to test if SendNotificationOptions.
+ * @returns true if SendNotificationOptions otherwise false.
  */
-function sendBroadcastNotification(context, notification, options = {}) {
-    return sendNotificationPayload(context, notification, "sendNotification", undefined, undefined, options);
+function isSendNotificationOptions(options) {
+    return coreUtil.objectHasProperty(options, "tags") || coreUtil.objectHasProperty(options, "enableTestSend");
 }
-
-// Copyright (c) Microsoft Corporation.
 /**
- * Sends a direct push notification to a device with the given push handle.
- * @param context - The Notification Hubs client.
- * @param pushHandle - The push handle which is the unique identifier for the device.
- * @param notification - The notification to send to the device.
- * @param options - The options for sending a direct notification.
- * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
+ * Determines whether the options are of type DirectSendNotificationOptions.
+ * @param options - The options to test if DirectSendNotificationOptions.
+ * @returns true if DirectSendNotificationOptions otherwise false.
  */
-function sendDirectNotification(context, pushHandle, notification, options = {}) {
-    return sendNotificationPayload(context, notification, "sendDirectNotification", pushHandle, undefined, options);
+function isDirectSendNotificationOptions(options) {
+    return coreUtil.objectHasProperty(options, "deviceHandle");
 }
 
 // Copyright (c) Microsoft Corporation.
 /**
  * Sends push notifications to devices that match the given tags or tag expression.
  * @param context - The Notification Hubs client.
- * @param tags - The tags used to target the device for push notifications in either an array or tag expression.
  * @param notification - The notification to send to the matching devices.
- * @param options - Configuration options for the direct send operation which can contain custom headers
- * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
+ * @param options - Options for the notification including tags, device handles and whether to enable test send.
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
-function sendNotification(context, tags, notification, options = {}) {
-    return sendNotificationPayload(context, notification, "sendNotification", undefined, tags, options);
-}
-
-// Copyright (c) Microsoft Corporation.
-const OPERATION_NAME$2 = "submitNotificationHubJob";
-/**
- * Submits a Notification Hub Job.
- * Note: this is available to Standard SKU namespace and above.
- * @param context - The Notification Hubs client.
- * @param job - The notification hub job to submit.
- * @param options - The operation options.
- * @returns The notification hub job details including job ID and status.
- */
-function submitNotificationHubJob(context, job, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$2}`, options, async (updatedOptions) => {
+function sendNotification(context, notification, options = { enableTestSend: false }) {
+    return tracingClient.withSpan(`NotificationHubsClientContext.sendNotification`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
-        endpoint.pathname += "/jobs";
-        const headers = await context.createHeaders(OPERATION_NAME$2);
-        headers.set("Content-Type", "application/atom+xml;type=entry;charset=utf-8");
+        endpoint.pathname += "/messages/";
+        // Check if batch direct send
+        if (isDirectSendNotificationOptions(options) && Array.isArray(options.deviceHandle)) {
+            endpoint.pathname += "$batch";
+        }
+        // Check for test send
+        if (isSendNotificationOptions(options) && options.enableTestSend) {
+            endpoint.searchParams.append("test", "true");
+        }
+        const headers = await context.createHeaders("sendNotification", notification.headers);
+        headers.set("ServiceBusNotification-Format", notification.platform);
+        let body = notification.body;
+        let contentType = notification.contentType;
+        // Check for direct batch send
+        if (isDirectSendNotificationOptions(options) && Array.isArray(options.deviceHandle)) {
+            endpoint.searchParams.append("direct", "true");
+            const boundary = `nh-boundary-${uuid.v4()}`;
+            contentType = `multipart/mixed; boundary = "${boundary}"`;
+            body = createMultipartDirectNotification(boundary, notification, options.deviceHandle);
+        }
+        else if (isDirectSendNotificationOptions(options)) {
+            endpoint.searchParams.append("direct", "true");
+            if (notification.platform === "browser") {
+                const browserHandle = options.deviceHandle;
+                headers.set("ServiceBusNotification-DeviceHandle", browserHandle.endpoint);
+                headers.set("Auth", browserHandle.auth);
+                headers.set("P256DH", browserHandle.p256dh);
+            }
+            else {
+                headers.set("ServiceBusNotification-DeviceHandle", options.deviceHandle);
+            }
+        }
+        else if (isSendNotificationOptions(options)) {
+            if (options.tags) {
+                headers.set("ServiceBusNotification-Tags", normalizeTags(options.tags));
+            }
+        }
+        headers.set("Content-Type", contentType);
+        headers.set("ServiceBusNotification-Format", notification.platform);
         const request = createRequest(endpoint, "POST", headers, updatedOptions);
-        request.body = serializeNotificationHubJobEntry(job);
+        request.body = body;
         const response = await sendRequest(context, request, 201);
-        return parseNotificationHubJobEntry(response.bodyAsText);
+        return parseNotificationSendResponse(response);
     });
 }
 
@@ -1648,7 +1755,7 @@ const OPERATION_NAME$1 = "updateInstallation";
  * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
  */
 function updateInstallation(context, installationId, installationPatches, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME$1}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME$1}`, options, async (updatedOptions) => {
         const endpoint = context.requestUrl();
         endpoint.pathname += `/installations/${installationId}`;
         const headers = await context.createHeaders(OPERATION_NAME$1);
@@ -1670,7 +1777,7 @@ const OPERATION_NAME = "updateRegistration";
  * @returns The updated registration description.
  */
 function updateRegistration(context, registration, options = {}) {
-    return tracingClient.withSpan(`NotificationHubsClientContext-${OPERATION_NAME}`, options, async (updatedOptions) => {
+    return tracingClient.withSpan(`NotificationHubsClientContext.${OPERATION_NAME}`, options, async (updatedOptions) => {
         if (!registration.etag) {
             throw new coreRestPipeline.RestError("ETag is required for registration update", { statusCode: 400 });
         }
@@ -1802,61 +1909,25 @@ class NotificationHubsServiceClient {
     listRegistrationsByTag(tag, options = {}) {
         return listRegistrationsByTag(this._client, tag, options);
     }
-    /**
-     * Sends a direct push notification to a device with the given push handle.
-     * @param pushHandle - The push handle which is the unique identifier for the device.
-     * @param notification - The notification to send to the device.
-     * @param options - The options for sending a direct notification.
-     * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
-     */
-    sendDirectNotification(pushHandle, notification, options = {}) {
-        return sendDirectNotification(this._client, pushHandle, notification, options);
-    }
     /**
      * Sends push notifications to devices that match the given tags or tag expression.
-     * @param tags - The tags used to target the device for push notifications in either an array or tag expression.
      * @param notification - The notification to send to the matching devices.
-     * @param options - Configuration options for the direct send operation which can contain custom headers
-     * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
+     * @param options - Options for the notification including tags, device handles and whether to enable test send.
      * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
      */
-    sendNotification(tags, notification, options = {}) {
-        return sendNotification(this._client, tags, notification, options);
-    }
-    /**
-     * Sends push notifications to all devices on the Notification Hub.
-     * @param notification - The notification to send to all devices.
-     * @param options - Configuration options for the direct send operation which can contain custom headers
-     * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
-     * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
-     */
-    sendBroadcastNotification(notification, options = {}) {
-        return sendBroadcastNotification(this._client, notification, options);
+    sendNotification(notification, options = { enableTestSend: false }) {
+        return sendNotification(this._client, notification, options);
     }
     /**
      * Schedules a push notification to devices that match the given tags or tag expression at the specified time.
      * NOTE: This is only available in Standard SKU Azure Notification Hubs.
      * @param scheduledTime - The Date to send the push notification.
-     * @param tags - The tags used to target the device for push notifications in either an array or tag expression.
      * @param notification - The notification to send to the matching devices.
-     * @param options - Configuration options for the direct send operation which can contain custom headers
-     * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
+     * @param options - Options which include tags used to target the device for push notifications in either an array or tag expression.
      * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
      */
-    scheduleNotification(scheduledTime, tags, notification, options = {}) {
-        return scheduleNotification(this._client, scheduledTime, tags, notification, options);
-    }
-    /**
-     * Schedules a push notification to all devices registered on the Notification Hub.
-     * NOTE: This is only available in Standard SKU Azure Notification Hubs.
-     * @param scheduledTime - The Date to send the push notification.
-     * @param notification - The notification to send to the matching devices.
-     * @param options - Configuration options for the direct send operation which can contain custom headers
-     * which may include APNs specific such as apns-topic or for WNS, X-WNS-TYPE.
-     * @returns A NotificationHubResponse with the tracking ID, correlation ID and location.
-     */
-    scheduleBroadcastNotification(scheduledTime, notification, options = {}) {
-        return scheduleBroadcastNotification(this._client, scheduledTime, notification, options);
+    scheduleNotification(scheduledTime, notification, options = {}) {
+        return scheduleNotification(this._client, scheduledTime, notification, options);
     }
     /**
      * Cancels the scheduled notification with the given notification ID.
@@ -1895,6 +1966,15 @@ class NotificationHubsServiceClient {
     getNotificationHubJob(jobId, options = {}) {
         return getNotificationHubJob(this._client, jobId, options);
     }
+    /**
+     * Submits a Notification Hub job and creates a poller to poll for results.
+     * @param notificationHubJob - The Notification Hub import/export job to start.
+     * @param options - The operation options.
+     * @returns A poller which can be called to poll until completion of the job.
+     */
+    beginSubmitNotificationHubJob(notificationHubJob, options = {}) {
+        return beginSubmitNotificationHubJob(this._client, notificationHubJob, options);
+    }
     /**
      * Submits a Notification Hub Job.  Note this is available to Standard SKU namespace and above.
      * @param job - The notification hub job to submit.