Merge pull request #245925 from williamzhao87/williamzhao/update-jr-qs

Update snippets

Author: prmerger-automator[bot]

articles/communication-services/concepts/router/exception-policy.md

@@ -99,9 +99,9 @@ administration_client.create_exception_policy(
 
 ```java
 administrationClient.createExceptionPolicy(new CreateExceptionPolicyOptions("policy1",
-    Map.of("rule1", new ExceptionRule()
-        .setTrigger(new QueueLengthExceptionTrigger().setThreshold(1))
-        .setActions(Map.of("cancelAction", new CancelExceptionAction())))
+    Map.of("rule1", new ExceptionRule(
+        new QueueLengthExceptionTrigger().setThreshold(1)
+        Map.of("cancelAction", new CancelExceptionAction())))
 ).setName("Max Queue Length Policy"));
 ```
 
@@ -181,12 +181,12 @@ administration_client.create_exception_policy(
 
 ```java
 administrationClient.createExceptionPolicy(new CreateExceptionPolicyOptions("policy2", Map.of(
-    "rule1", new ExceptionRule()
-        .setTrigger(new WaitTimeExceptionTrigger().setThresholdSeconds(60))
-        .setActions(Map.of("increasePriority", new ManualReclassifyExceptionAction().setPriority(10))),
-    "rule2", new ExceptionRule()
-        .setTrigger(new WaitTimeExceptionTrigger().setThresholdSeconds(300))
-        .setActions(Map.of("changeQueue", new ManualReclassifyExceptionAction().setQueueId("queue2"))))
+    "rule1", new ExceptionRule(
+        new WaitTimeExceptionTrigger(60),
+        Map.of("increasePriority", new ManualReclassifyExceptionAction().setPriority(10))),
+    "rule2", new ExceptionRule(
+        new WaitTimeExceptionTrigger(300),
+        Map.of("changeQueue", new ManualReclassifyExceptionAction().setQueueId("queue2"))))
 ).setName("Escalation Policy"));
 ```
 

articles/communication-services/concepts/router/matching-concepts.md

@@ -81,7 +81,7 @@ await client.createWorker("worker-1", {
 client.create_worker(worker_id = "worker-1", router_worker = RouterWorker(
     total_capacity = 2,
     queue_assignments = {
-        "queue2": QueueAssignment()
+        "queue2": RouterQueueAssignment()
     },
     channel_configurations = {
         "voice": ChannelConfiguration(capacity_cost_per_job = 2),
@@ -103,11 +103,11 @@ client.create_worker(worker_id = "worker-1", router_worker = RouterWorker(
 ```java
 client.createWorker(new CreateWorkerOptions("worker-1", 2)
     .setQueueAssignments(Map.of(
-        "queue1", new QueueAssignment(),
-        "queue2", new QueueAssignment()))
+        "queue1", new RouterQueueAssignment(),
+        "queue2", new RouterQueueAssignment()))
     .setChannelConfigurations(Map.of(
-        "voice", new ChannelConfiguration().setCapacityCostPerJob(2),
-        "chat", new ChannelConfiguration().setCapacityCostPerJob(1)))
+        "voice", new ChannelConfiguration(2),
+        "chat", new ChannelConfiguration(1)))
     .setLabels(Map.of(
         "Skill", new LabelValue(11),
         "English", new LabelValue(true),
@@ -194,14 +194,8 @@ client.create_job(job_id = "job1", router_job = RouterJob(
 ```java
 client.createJob(new CreateJobOptions("job1", "chat", "queue1")
     .setRequestedWorkerSelectors(List.of(
-        new RouterWorkerSelector()
-          .setKey("English")
-          .setLabelOperator(LabelOperator.EQUAL)
-          .setValue(new LabelValue(true)),
-        new RouterWorkerSelector()
-          .setKey("Skill")
-          .setLabelOperator(LabelOperator.GREATER_THAN)
-          .setValue(new LabelValue(10))))
+        new RouterWorkerSelector("English", LabelOperator.EQUAL, new LabelValue(true)),
+        new RouterWorkerSelector("Skill", LabelOperator.GREATER_THAN, new LabelValue(10))))
     .setLabels(Map.of("name", new LabelValue("John"))));
 ```
 

articles/communication-services/concepts/router/worker-capacity-concepts.md

@@ -79,8 +79,8 @@ client.create_worker(worker_id = "worker1", router_worker = RouterWorker(
 client.createWorker(new CreateWorkerOptions("worker1", 100)
     .setQueueAssignments(Map.of("queue1", new RouterQueueAssignment()))
     .setChannelConfigurations(Map.of(
-        "voice", new ChannelConfiguration().setCapacityCostPerJob(100),
-        "chat", new ChannelConfiguration().setCapacityCostPerJob(20))))
+        "voice", new ChannelConfiguration(100),
+        "chat", new ChannelConfiguration(20))));
 ```
 
 ::: zone-end
@@ -147,9 +147,9 @@ client.create_worker(worker_id = "worker1", router_worker = RouterWorker(
 client.createWorker(new CreateWorkerOptions("worker1", 100)
     .setQueueAssignments(Map.of("queue1", new RouterQueueAssignment()))
     .setChannelConfigurations(Map.of(
-        "voice", new ChannelConfiguration().setCapacityCostPerJob(60),
-        "chat", new ChannelConfiguration().setCapacityCostPerJob(10).setMaxNumberOfJobs(2),
-        "email", new ChannelConfiguration().setCapacityCostPerJob(10).setMaxNumberOfJobs(2))))
+        "voice", new ChannelConfiguration(60),
+        "chat", new ChannelConfiguration(10).setMaxNumberOfJobs(2),
+        "email", new ChannelConfiguration(10).setMaxNumberOfJobs(2))));
 ```
 
 ::: zone-end

articles/communication-services/how-tos/router-sdk/escalate-job.md

@@ -45,7 +45,7 @@ var classificationPolicy = await administrationClient.CreateClassificationPolicy
         {
             new ConditionalQueueSelectorAttachment(
                 condition: new ExpressionRouterRule("job.Escalated = true"),
-                labelSelectors: new List<RouterQueueSelector>
+                queueSelectors: new List<RouterQueueSelector>
             {
                 new (key: "Id", labelOperator: LabelOperator.Equal, value: new LabelValue("XBOX_Escalation_Queue"))
             })
@@ -67,7 +67,7 @@ var classificationPolicy = await administrationClient.createClassificationPolicy
             kind: "expression-rule",
             expression: 'job.Escalated = true'
         },
-        labelSelectors: [{
+        queueSelectors: [{
             key: "Id",
             labelOperator: "equal",
             value: "XBOX_Escalation_Queue"
@@ -91,7 +91,7 @@ classification_policy: ClassificationPolicy = administration_client.create_class
         queue_selectors = [
             ConditionalQueueSelectorAttachment(
                 condition = ExpressionRouterRule(expression = 'job.Escalated = true'),
-                label_selectors = [
+                queue_selectors = [
                     RouterQueueSelector(key = "Id", label_operator = LabelOperator.EQUAL, value = "XBOX_Escalation_Queue")
                 ]
             )
@@ -107,12 +107,10 @@ classification_policy: ClassificationPolicy = administration_client.create_class
 ClassificationPolicy classificationPolicy = administrationClient.createClassificationPolicy(
     new CreateClassificationPolicyOptions("Classify_XBOX_Voice_Jobs")
         .setName("Classify XBOX Voice Jobs")
-        .setQueueSelectors(List.of(new ConditionalQueueSelectorAttachment()
-            .setCondition(new ExpressionRouterRule().setExpression("job.Escalated = true"))
-            .setLabelSelectors(List.of(
-                new RouterQueueSelector().setKey("Id").setLabelOperator(LabelOperator.EQUAL).setValue("XBOX_Escalation_Queue"))
-            )))
-        .setPrioritizationRule(new ExpressionRouterRule().setExpression("If(job.Escalated = true, 10, 1)")));
+        .setQueueSelectors(List.of(new ConditionalQueueSelectorAttachment(
+            new ExpressionRouterRule("job.Escalated = true"),
+            List.of(new RouterQueueSelector("Id", LabelOperator.EQUAL, new LabelValue("XBOX_Escalation_Queue"))))))
+        .setPrioritizationRule(new ExpressionRouterRule("If(job.Escalated = true, 10, 1)")));
 ```
 
 ::: zone-end
@@ -188,9 +186,8 @@ administration_client.create_exception_policy(
 
 ```java
 administrationClient.createExceptionPolicy(new CreateExceptionPolicyOptions("Escalate_XBOX_Policy",
-    Map.of("Escalated_Rule", new ExceptionRule()
-        .setTrigger(new WaitTimeExceptionTrigger().setThresholdSeconds(5 * 60))
-        .setActions(Map.of("EscalateReclassifyExceptionAction", new ReclassifyExceptionAction()
+    Map.of("Escalated_Rule", new ExceptionRule(new WaitTimeExceptionTrigger(5 * 60),
+        Map.of("EscalateReclassifyExceptionAction", new ReclassifyExceptionAction()
             .setClassificationPolicyId(classificationPolicy.getId())
             .setLabelsToUpsert(Map.of("Escalated", new LabelValue(true))))))
 ).setName("Add escalated label and reclassify XBOX Job requests after 5 minutes"));
@@ -282,9 +279,9 @@ When you submit the Job, it is added to the queue `XBOX_Queue` with the `voice`
 ```csharp
 await client.CreateJobAsync(new CreateJobOptions(jobId: "job1", channelId: "voice", queueId: defaultQueue.Value.Id)
 {
-    RequestedWorkerSelectors = new List<RouterWorkerSelector>
+    RequestedWorkerSelectors =
     {
-        new(key: "XBOX_Hardware", labelOperator: LabelOperator.GreaterThanEqual, value: new LabelValue(7))
+        new RouterWorkerSelector(key: "XBOX_Hardware", labelOperator: LabelOperator.GreaterThanEqual, value: new LabelValue(7))
     }
 });
 ```
@@ -322,10 +319,8 @@ administration_client.create_job(
 
 ```java
 administrationClient.createJob(new CreateJobOptions("job1", "voice", defaultQueue.getId())
-    .setRequestedWorkerSelectors(List.of(new RouterWorkerSelector()
-        .setKey("XBOX_Hardware")
-        .setLabelOperator(LabelOperator.GREATER_THAN_EQUAL)
-        .setValue(new LabelValue(7)))));
+    .setRequestedWorkerSelectors(List.of(
+        new RouterWorkerSelector("XBOX_Hardware", LabelOperator.GREATER_THAN_EQUAL, new LabelValue(7)))));
 ```
 
 ::: zone-end

articles/communication-services/how-tos/router-sdk/job-classification.md

@@ -104,11 +104,9 @@ classification_policy: ClassificationPolicy = administration_client.create_class
 ClassificationPolicy classificationPolicy = administrationClient.createClassificationPolicy(
     new CreateClassificationPolicyOptions("XBOX_NA_QUEUE_Priority_1_10")
         .setName("Select XBOX Queue and set priority to 1 or 10")
-        .setQueueSelectors(List.of(new ConditionalQueueSelectorAttachment()
-            .setCondition(new ExpressionRouterRule().setExpression("job.Region = \"NA\""))
-            .setQueueSelectors(List.of(
-                new RouterQueueSelector().setKey("Id").setLabelOperator(LabelOperator.EQUAL).setValue("XBOX_NA_QUEUE"))
-            )))
+        .setQueueSelectors(List.of(new ConditionalQueueSelectorAttachment(
+            new ExpressionRouterRule("job.Region = \"NA\""),
+            List.of(new RouterQueueSelector("Id", LabelOperator.EQUAL, new LabelValue("XBOX_NA_QUEUE"))))))
         .setFallbackQueueId("XBOX_DEFAULT_QUEUE")
         .setPrioritizationRule(new ExpressionRouterRule().setExpression("If(job.Hardware_VIP = true, 10, 1)")));
 ```
@@ -243,8 +241,8 @@ administration_client.create_classification_policy(
 
 ```java
 administrationClient.createClassificationPolicy(new CreateClassificationPolicyOptions("policy-1")
-    .setWorkerSelectors(List.of(new StaticWorkerSelectorAttachment()
-        .setWorkerSelector(new RouterWorkerSelector().setKey("Foo").setLabelOperator(LabelOperator.EQUAL).setValue("Bar")))));
+    .setWorkerSelectors(List.of(
+        new StaticWorkerSelectorAttachment(new RouterWorkerSelector("Foo", LabelOperator.EQUAL, new LabelValue("Bar"))))));
 ```
 
 ::: zone-end
@@ -310,9 +308,9 @@ administration_client.create_classification_policy(
 
 ```java
 administrationClient.createClassificationPolicy(new CreateClassificationPolicyOptions("policy-1")
-    .setWorkerSelectors(List.of(new ConditionalRouterWorkerSelectorAttachment()
-        .setCondition(new ExpressionRouterRule().setExpression("job.Urgent = true"))
-        .setWorkerSelectors(List.of(new RouterWorkerSelector().setKey("Foo").setLabelOperator(LabelOperator.EQUAL).setValue("Bar"))))));
+    .setWorkerSelectors(List.of(new ConditionalRouterWorkerSelectorAttachment(
+        new ExpressionRouterRule("job.Urgent = true"),
+        List.of(new RouterWorkerSelector("Foo", LabelOperator.EQUAL, new LabelValue("Bar")))))));
 ```
 
 ::: zone-end
@@ -370,8 +368,7 @@ administration_client.create_classification_policy(
 
 ```java
 administrationClient.createClassificationPolicy(new CreateClassificationPolicyOptions("policy-1")
-    .setWorkerSelectors(List.of(new PassThroughWorkerSelectorAttachment()
-        .setKey("Foo").setLabelOperator(LabelOperator.EQUAL))));
+    .setWorkerSelectors(List.of(new PassThroughWorkerSelectorAttachment("Foo", LabelOperator.EQUAL))));
 ```
 
 ::: zone-end
@@ -449,10 +446,10 @@ administration_client.create_classification_policy(
 
 ```java
 administrationClient.createClassificationPolicy(new CreateClassificationPolicyOptions("policy-1")
-    .setWorkerSelectors(List.of(new WeightedAllocationWorkerSelectorAttachment()
-        .setAllocations(List.of(new WorkerWeightedAllocation().setWeight(0.3).setWorkerSelectors(List.of(
-            new RouterWorkerSelector().setKey("Vendor").setLabelOperator(LabelOperator.EQUAL).setValue("A"),
-            new RouterWorkerSelector().setKey("Vendor").setLabelOperator(LabelOperator.EQUAL).setValue("B")
+    .setWorkerSelectors(List.of(new WeightedAllocationWorkerSelectorAttachment(
+        List.of(new WorkerWeightedAllocation(0.3, List.of(
+            new RouterWorkerSelector("Vendor", LabelOperator.EQUAL, new LabelValue("A")),
+            new RouterWorkerSelector("Vendor", LabelOperator.EQUAL, new LabelValue("B"))
         )))))));
 ```
 

articles/communication-services/how-tos/router-sdk/preferred-worker.md

@@ -91,12 +91,11 @@ client.create_job(job_id = "job1", router_job = RouterJob(
 
 ```java
 client.createJob(new CreateJobOptions("job1", "Xbox_Chat_Channel", queue.getId())
-    .setRequestedWorkerSelectors(List.of(new RouterWorkerSelector().setKey("Id")
-        .setLabelOperator(LabelOperator.EQUAL)
-        .setValue(new LabelValue("<preferred_worker_id>"))
-        .setExpireAfterSeconds(45.0)
-        .setExpedite(true))));
-```
+    .setRequestedWorkerSelectors(List.of(
+        new RouterWorkerSelector("Id", LabelOperator.EQUAL, new LabelValue("<preferred_worker_id>"))
+          .setExpireAfterSeconds(45.0)
+          .setExpedite(true))));
+  ```
 
 ::: zone-end
 

articles/communication-services/how-tos/router-sdk/scheduled-jobs.md

@@ -40,7 +40,8 @@ In the following example, a job is created that will be scheduled 3 minutes from
 ```csharp
 await client.CreateJobAsync(new CreateJobOptions(jobId: "job1", channelId: "Voice", queueId: "Callback")
 {
-    MatchingMode = new ScheduleAndSuspendMode(scheduleAt: DateTimeOffset.UtcNow.Add(TimeSpan.FromMinutes(3)))
+    MatchingMode = new JobMatchingMode(
+        new ScheduleAndSuspendMode(scheduleAt: DateTimeOffset.UtcNow.Add(TimeSpan.FromMinutes(3))))
 });
 ```
 
@@ -53,7 +54,6 @@ await client.createJob("job1", {
     channelId: "Voice",
     queueId: "Callback",
     matchingMode: {
-        modeType: "scheduleAndSuspendMode",
         scheduleAndSuspendMode: {
             scheduleAt: new Date(Date.now() + 3 * 60000)
         }
@@ -70,7 +70,6 @@ client.create_job(job_id = "job1", router_job = RouterJob(
     channel_id = "Voice",
     queue_id = "Callback",
     matching_mode = JobMatchingMode(
-        mode_type = "scheduleAndSuspendMode",
         schedule_and_suspend_mode = ScheduleAndSuspendMode(scheduled_at = datetime.utcnow() + timedelta(minutes = 3)))))
 ```
 
@@ -80,7 +79,7 @@ client.create_job(job_id = "job1", router_job = RouterJob(
 
 ```java
 client.createJob(new CreateJobOptions("job1", "Voice", "Callback")
-    .setMatchingMode(new ScheduleAndSuspendMode(OffsetDateTime.now().plusMinutes(3))));
+    .setMatchingMode(new JobMatchingMode(new ScheduleAndSuspendMode(OffsetDateTime.now().plusMinutes(3)))));
 ```
 
 ::: zone-end
@@ -99,7 +98,7 @@ if (eventGridEvent.EventType == "Microsoft.Communication.RouterJobWaitingForActi
 
     await client.UpdateJobAsync(new UpdateJobOptions(jobId: eventGridEvent.Data.JobId)
     {
-        MatchingMode = new QueueAndMatchMode(),
+        MatchingMode = new JobMatchingMode(new QueueAndMatchMode()),
         Priority = 100
     });
 }
@@ -116,7 +115,7 @@ if (eventGridEvent.EventType == "Microsoft.Communication.RouterJobWaitingForActi
     // Perform required actions here
 
     await client.updateJob(eventGridEvent.data.jobId, {
-        matchingMode: { modeType: "queueAndMatchMode", queueAndMatchMode: {} },
+        matchingMode: { queueAndMatchMode: {} },
         priority: 100
     });
 }
@@ -133,7 +132,7 @@ if (eventGridEvent.event_type == "Microsoft.Communication.RouterJobWaitingForAct
     # Perform required actions here
 
     client.update_job(job_id = eventGridEvent.data.job_id,
-        matching_mode = JobMatchingMode(mode_type = queueAndMatchMode, queue_and_match_mode = {}),
+        matching_mode = JobMatchingMode(queue_and_match_mode = {}),
         priority = 100)
 }
 ```
@@ -149,7 +148,7 @@ if (eventGridEvent.EventType == "Microsoft.Communication.RouterJobWaitingForActi
     // Perform required actions here
 
     client.updateJob(new UpdateJobOptions(eventGridEvent.Data.JobId)
-        .setMatchingMode(new QueueAndMatchMode())
+        .setMatchingMode(new JobMatchingMode(new QueueAndMatchMode()))
         .setPriority(100));
 }
 ```

articles/communication-services/quickstarts/router/includes/router-quickstart-java.md

@@ -151,10 +151,8 @@ Now, we can submit a job directly to that queue, with a worker selector that req
 ```java
 RouterJob job = routerClient.createJob(new CreateJobOptions("job-1", "voice", queue.getId())
     .setPriority(1)
-    .setRequestedWorkerSelectors(List.of(new RouterWorkerSelector()
-        .setKey("Some-Skill")
-        .setLabelOperator(LabelOperator.GREATER_THAN)
-        .setValue(new LabelValue(10)))));
+    .setRequestedWorkerSelectors(List.of(
+        new RouterWorkerSelector("Some-Skill", LabelOperator.GREATER_THAN, new LabelValue(10)))));
 ```
 
 ## Create a worker
@@ -166,7 +164,7 @@ RouterWorker worker = routerClient.createWorker(
     new CreateWorkerOptions("worker-1", 1)
         .setQueueAssignments(Map.of(queue.getId(), new RouterQueueAssignment()))
         .setLabels(Map.of("Some-Skill", new LabelValue(11)))
-        .setChannelConfigurations(Map.of("voice", new ChannelConfiguration().setCapacityCostPerJob(1))));
+        .setChannelConfigurations(Map.of("voice", new ChannelConfiguration(1))));
 ```
 
 ## Receive an offer