diff --git a/sdk/communication/azure-communication-jobrouter/assets.json b/sdk/communication/azure-communication-jobrouter/assets.json
index b31c312f7260..30f460c18040 100644
--- a/sdk/communication/azure-communication-jobrouter/assets.json
+++ b/sdk/communication/azure-communication-jobrouter/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/communication/azure-communication-jobrouter",
-  "Tag": "java/communication/azure-communication-jobrouter_b970df9fcf"
+  "Tag": "java/communication/azure-communication-jobrouter_db1da26178"
 }
diff --git a/sdk/communication/azure-communication-jobrouter/customization/src/main/java/JobRouterSdkCustomization.java b/sdk/communication/azure-communication-jobrouter/customization/src/main/java/JobRouterSdkCustomization.java
index f85667b535da..20deb030d45f 100644
--- a/sdk/communication/azure-communication-jobrouter/customization/src/main/java/JobRouterSdkCustomization.java
+++ b/sdk/communication/azure-communication-jobrouter/customization/src/main/java/JobRouterSdkCustomization.java
@@ -3,6 +3,7 @@
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import org.slf4j.Logger;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,6 +30,13 @@ public void customize(LibraryCustomization customization, Logger logger) {
         addConnectionStringClientMethod(classCustomizationForJobRouterClientBuilder, "JobRouterClientBuilder");
         addHttpPipelineAuthPolicyMethod(classCustomizationForJobRouterClientBuilder);
         updateHttpPipelineMethod(classCustomizationForJobRouterClientBuilder);
+
+        logger.info("Customizing the ScoringRuleOptions class");
+        PackageCustomization modelsPackageCustomization = customization.getPackage("com.azure.communication.jobrouter.models");
+        ClassCustomization classCustomizationForScoringRuleOptions = modelsPackageCustomization.getClass("ScoringRuleOptions");
+        classCustomizationForScoringRuleOptions
+            .getMethod("setIsBatchScoringEnabled")
+            .setModifier(Modifier.PRIVATE);
     }
 
     private void addAuthTraits(ClassCustomization classCustomization) {
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/converters/RouterRuleAdapter.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/converters/RouterRuleAdapter.java
index 6aa3187d248b..cfbc47cbe48f 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/converters/RouterRuleAdapter.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/converters/RouterRuleAdapter.java
@@ -49,9 +49,9 @@ public static RouterRuleInternal getRouterRuleInternal(RouterRule routerRule) {
             } else if (routerRule.getClass() == WebhookRouterRule.class) {
                 WebhookRouterRule webhookRouterRule = (WebhookRouterRule) routerRule;
                 prioritizationRuleInternal = new WebhookRouterRuleInternal()
-                    .setAuthorizationServerUri(webhookRouterRule.getAuthorizationServerUri())
+                    .setAuthorizationServerUri(webhookRouterRule.getAuthorizationServerUrl())
                     .setClientCredential(webhookRouterRule.getClientCredential())
-                    .setWebhookUri(webhookRouterRule.getWebhookUri());
+                    .setWebhookUri(webhookRouterRule.getWebhookUrl());
             }
         }
 
@@ -75,11 +75,11 @@ public static RouterRuleInternal convertRouterRuleToInternal(RouterRule rule) {
             return new StaticRouterRuleInternal().setValue(RouterValueAdapter.getValue(((StaticRouterRule) rule).getValue()));
         } else if (rule instanceof WebhookRouterRule) {
             WebhookRouterRule webhookRouterRule = (WebhookRouterRule) rule;
-            return new WebhookRouterRuleInternal().setWebhookUri(webhookRouterRule.getWebhookUri())
+            return new WebhookRouterRuleInternal().setWebhookUri(webhookRouterRule.getWebhookUrl())
                 .setClientCredential(new OAuth2WebhookClientCredential()
                     .setClientId(webhookRouterRule.getClientCredential().getClientId())
                     .setClientSecret(webhookRouterRule.getClientCredential().getClientSecret()))
-                .setAuthorizationServerUri(webhookRouterRule.getAuthorizationServerUri());
+                .setAuthorizationServerUri(webhookRouterRule.getAuthorizationServerUrl());
         }
 
         return null;
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/BestWorkerMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/BestWorkerMode.java
index b57f8c5dd8fa..b3bc0e453a3c 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/BestWorkerMode.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/BestWorkerMode.java
@@ -30,8 +30,14 @@ public final class BestWorkerMode extends DistributionMode {
     private ScoringRuleOptions scoringRuleOptions;
 
     /** Creates an instance of BestWorkerMode class. */
-    public BestWorkerMode() {
-        this.kind = DistributionModeKind.BEST_WORKER;
+    public BestWorkerMode() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public DistributionModeKind getKind() {
+        return DistributionModeKind.BEST_WORKER;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/CancelExceptionAction.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/CancelExceptionAction.java
index 584d3ed1ee92..f11eaf39f71c 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/CancelExceptionAction.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/CancelExceptionAction.java
@@ -29,8 +29,14 @@ public final class CancelExceptionAction extends ExceptionAction {
     private String dispositionCode;
 
     /** Creates an instance of CancelExceptionAction class. */
-    public CancelExceptionAction() {
-        this.kind = ExceptionActionKind.CANCEL;
+    public CancelExceptionAction() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public ExceptionActionKind getKind() {
+        return ExceptionActionKind.CANCEL;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalQueueSelectorAttachment.java
index 556075b6be11..20c2bff66436 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalQueueSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalQueueSelectorAttachment.java
@@ -53,7 +53,14 @@ public ConditionalQueueSelectorAttachment(
             @JsonProperty(value = "queueSelectors") List<RouterQueueSelector> queueSelectors) {
         this.condition = condition;
         this.queueSelectors = queueSelectors;
-        this.kind = QueueSelectorAttachmentKind.CONDITIONAL;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public QueueSelectorAttachmentKind getKind() {
+        return QueueSelectorAttachmentKind.CONDITIONAL;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalWorkerSelectorAttachment.java
index 894387412718..4b2bdd1f435d 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalWorkerSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ConditionalWorkerSelectorAttachment.java
@@ -53,7 +53,14 @@ public ConditionalWorkerSelectorAttachment(
             @JsonProperty(value = "workerSelectors") List<RouterWorkerSelector> workerSelectors) {
         this.condition = condition;
         this.workerSelectors = workerSelectors;
-        this.kind = WorkerSelectorAttachmentKind.CONDITIONAL;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public WorkerSelectorAttachmentKind getKind() {
+        return WorkerSelectorAttachmentKind.CONDITIONAL;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DirectMapRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DirectMapRouterRule.java
index 2f84d7a71c45..b2149e4f73d0 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DirectMapRouterRule.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DirectMapRouterRule.java
@@ -14,7 +14,13 @@
 public final class DirectMapRouterRule extends RouterRule {
 
     /** Creates an instance of DirectMapRouterRule class. */
-    public DirectMapRouterRule() {
-        this.kind = RouterRuleKind.DIRECT_MAP;
+    public DirectMapRouterRule() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public RouterRuleKind getKind() {
+        return RouterRuleKind.DIRECT_MAP;
     }
 }
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DistributionMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DistributionMode.java
index 419c15d7fb70..3b58baf64644 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DistributionMode.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/DistributionMode.java
@@ -28,7 +28,7 @@ public abstract class DistributionMode {
      * kind discriminator.
      */
     @JsonProperty(value = "kind")
-    protected DistributionModeKind kind;
+    private DistributionModeKind kind;
 
     /*
      * Governs the minimum desired number of active concurrent offers a job can have.
@@ -123,7 +123,5 @@ public DistributionMode setBypassSelectors(Boolean bypassSelectors) {
      * Returns kind discriminator.
      * @return kind.
      */
-    public DistributionModeKind getKind() {
-        return this.kind;
-    }
+    public abstract DistributionModeKind getKind();
 }
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionAction.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionAction.java
index ed9e2a0ebb38..72611486eb36 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionAction.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionAction.java
@@ -3,6 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 package com.azure.communication.jobrouter.models;
 
+import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -20,12 +21,13 @@
     @JsonSubTypes.Type(name = "manualReclassify", value = ManualReclassifyExceptionAction.class),
     @JsonSubTypes.Type(name = "reclassify", value = ReclassifyExceptionAction.class)
 })
+@Immutable
 public abstract class ExceptionAction {
     /**
      * kind discriminator.
      */
     @JsonProperty(value = "kind")
-    protected ExceptionActionKind kind;
+    private ExceptionActionKind kind;
 
     /** Creates an instance of ExceptionAction class. */
     public ExceptionAction() {}
@@ -49,7 +51,5 @@ public String getId() {
      * Returns kind discriminator.
      * @return kind.
      */
-    public ExceptionActionKind getKind() {
-        return this.kind;
-    }
+    public abstract ExceptionActionKind getKind();
 }
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionTrigger.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionTrigger.java
index 8bdb47fda3ce..d9d5327668a0 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionTrigger.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExceptionTrigger.java
@@ -3,6 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 package com.azure.communication.jobrouter.models;
 
+import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -19,12 +20,13 @@
     @JsonSubTypes.Type(name = "queueLength", value = QueueLengthExceptionTrigger.class),
     @JsonSubTypes.Type(name = "waitTime", value = WaitTimeExceptionTrigger.class)
 })
+@Immutable
 public abstract class ExceptionTrigger {
     /**
      * kind discriminator.
      */
     @JsonProperty(value = "kind")
-    protected ExceptionTriggerKind kind;
+    private ExceptionTriggerKind kind;
 
     /** Creates an instance of ExceptionTrigger class. */
     public ExceptionTrigger() {}
@@ -33,7 +35,5 @@ public ExceptionTrigger() {}
      * Returns kind discriminator.
      * @return kind.
      */
-    public ExceptionTriggerKind getKind() {
-        return this.kind;
-    }
+    public abstract ExceptionTriggerKind getKind();
 }
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExpressionRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExpressionRouterRule.java
index 149e4acaf1c8..944c4a2d63de 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExpressionRouterRule.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ExpressionRouterRule.java
@@ -35,7 +35,14 @@ public final class ExpressionRouterRule extends RouterRule {
     @JsonCreator
     public ExpressionRouterRule(@JsonProperty(value = "expression") String expression) {
         this.expression = expression;
-        this.kind = RouterRuleKind.EXPRESSION;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public RouterRuleKind getKind() {
+        return RouterRuleKind.EXPRESSION;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/FunctionRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/FunctionRouterRule.java
index ada90799bbbb..ded04cfe37b9 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/FunctionRouterRule.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/FunctionRouterRule.java
@@ -35,7 +35,14 @@ public final class FunctionRouterRule extends RouterRule {
     @JsonCreator
     public FunctionRouterRule(@JsonProperty(value = "functionUri") String functionUri) {
         this.functionUri = functionUri;
-        this.kind = RouterRuleKind.FUNCTION;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public RouterRuleKind getKind() {
+        return RouterRuleKind.FUNCTION;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/LongestIdleMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/LongestIdleMode.java
index a107580c4e96..0ca81d91d9dd 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/LongestIdleMode.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/LongestIdleMode.java
@@ -13,8 +13,14 @@
 @Fluent
 public final class LongestIdleMode extends DistributionMode {
     /** Creates an instance of LongestIdleMode class. */
-    public LongestIdleMode() {
-        this.kind = DistributionModeKind.LONGEST_IDLE;
+    public LongestIdleMode() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public DistributionModeKind getKind() {
+        return DistributionModeKind.LONGEST_IDLE;
     }
 
     /** {@inheritDoc} */
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ManualReclassifyExceptionAction.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ManualReclassifyExceptionAction.java
index df7caef0085f..c507796f5737 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ManualReclassifyExceptionAction.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ManualReclassifyExceptionAction.java
@@ -35,8 +35,14 @@ public final class ManualReclassifyExceptionAction extends ExceptionAction {
     private List<RouterWorkerSelector> workerSelectors;
 
     /** Creates an instance of ManualReclassifyExceptionAction class. */
-    public ManualReclassifyExceptionAction() {
-        this.kind = ExceptionActionKind.MANUAL_RECLASSIFY;
+    public ManualReclassifyExceptionAction() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public ExceptionActionKind getKind() {
+        return ExceptionActionKind.MANUAL_RECLASSIFY;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughQueueSelectorAttachment.java
index c13ad012cdfd..8423781cf8f7 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughQueueSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughQueueSelectorAttachment.java
@@ -39,7 +39,14 @@ public PassThroughQueueSelectorAttachment(
             @JsonProperty(value = "labelOperator") LabelOperator labelOperator) {
         this.key = key;
         this.labelOperator = labelOperator;
-        this.kind = QueueSelectorAttachmentKind.PASS_THROUGH;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public QueueSelectorAttachmentKind getKind() {
+        return QueueSelectorAttachmentKind.PASS_THROUGH;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughWorkerSelectorAttachment.java
index 3d220b9b084f..8993e79a71c3 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughWorkerSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/PassThroughWorkerSelectorAttachment.java
@@ -51,7 +51,14 @@ public PassThroughWorkerSelectorAttachment(
             @JsonProperty(value = "labelOperator") LabelOperator labelOperator) {
         this.key = key;
         this.labelOperator = labelOperator;
-        this.kind = WorkerSelectorAttachmentKind.PASS_THROUGH;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public WorkerSelectorAttachmentKind getKind() {
+        return WorkerSelectorAttachmentKind.PASS_THROUGH;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueLengthExceptionTrigger.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueLengthExceptionTrigger.java
index 0f43ca81063b..09ee2a721feb 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueLengthExceptionTrigger.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueLengthExceptionTrigger.java
@@ -29,7 +29,14 @@ public final class QueueLengthExceptionTrigger extends ExceptionTrigger {
     @JsonCreator
     public QueueLengthExceptionTrigger(@JsonProperty(value = "threshold") int threshold) {
         this.threshold = threshold;
-        this.kind = ExceptionTriggerKind.QUEUE_LENGTH;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public ExceptionTriggerKind getKind() {
+        return ExceptionTriggerKind.QUEUE_LENGTH;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueSelectorAttachment.java
index af36d7317d86..5f17bf9af3d0 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/QueueSelectorAttachment.java
@@ -3,6 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 package com.azure.communication.jobrouter.models;
 
+import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -24,12 +25,13 @@
             name = "weightedAllocation",
             value = WeightedAllocationQueueSelectorAttachment.class)
 })
+@Immutable
 public abstract class QueueSelectorAttachment {
     /**
      * kind discriminator.
      */
     @JsonProperty(value = "kind")
-    protected QueueSelectorAttachmentKind kind;
+    private QueueSelectorAttachmentKind kind;
 
     /** Creates an instance of QueueSelectorAttachment class. */
     public QueueSelectorAttachment() {}
@@ -38,7 +40,5 @@ public QueueSelectorAttachment() {}
      * Returns kind discriminator.
      * @return kind.
      */
-    public QueueSelectorAttachmentKind getKind() {
-        return this.kind;
-    }
+    public abstract QueueSelectorAttachmentKind getKind();
 }
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ReclassifyExceptionAction.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ReclassifyExceptionAction.java
index fa2c57edceb4..9b9ccb17484b 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ReclassifyExceptionAction.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ReclassifyExceptionAction.java
@@ -35,8 +35,14 @@ public final class ReclassifyExceptionAction extends ExceptionAction {
     private Map<String, RouterValue> labelsToUpsert;
 
     /** Creates an instance of ReclassifyExceptionAction class. */
-    public ReclassifyExceptionAction() {
-        this.kind = ExceptionActionKind.RECLASSIFY;
+    public ReclassifyExceptionAction() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public ExceptionActionKind getKind() {
+        return ExceptionActionKind.RECLASSIFY;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RoundRobinMode.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RoundRobinMode.java
index c3f6beae9d83..9b500a1d8c10 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RoundRobinMode.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RoundRobinMode.java
@@ -16,8 +16,14 @@
 public final class RoundRobinMode extends DistributionMode {
 
     /** Creates an instance of RoundRobinMode class. */
-    public RoundRobinMode() {
-        this.kind = DistributionModeKind.ROUND_ROBIN;
+    public RoundRobinMode() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public DistributionModeKind getKind() {
+        return DistributionModeKind.ROUND_ROBIN;
     }
 
     /** {@inheritDoc} */
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RouterRule.java
index 0b10a599eb29..bd6b57f5fa07 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RouterRule.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RouterRule.java
@@ -3,6 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 package com.azure.communication.jobrouter.models;
 
+import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -27,13 +28,14 @@
     @JsonSubTypes.Type(name = "static", value = StaticRouterRule.class),
     @JsonSubTypes.Type(name = "webhook", value = WebhookRouterRule.class)
 })
+@Immutable
 public abstract class RouterRule {
 
     /**
      * kind discriminator.
      */
     @JsonProperty(value = "kind")
-    protected RouterRuleKind kind;
+    private RouterRuleKind kind;
 
     /** Creates an instance of RouterRule class. */
     public RouterRule() {}
@@ -42,7 +44,5 @@ public RouterRule() {}
      * Returns kind discriminator.
      * @return kind.
      */
-    public RouterRuleKind getKind() {
-        return this.kind;
-    }
+    public abstract RouterRuleKind getKind();
 }
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineQueueSelectorAttachment.java
index 33953961bc8a..a17057f47185 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineQueueSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineQueueSelectorAttachment.java
@@ -41,7 +41,14 @@ public final class RuleEngineQueueSelectorAttachment extends QueueSelectorAttach
     @JsonCreator
     public RuleEngineQueueSelectorAttachment(@JsonProperty(value = "rule") RouterRule rule) {
         this.rule = rule;
-        this.kind = QueueSelectorAttachmentKind.RULE_ENGINE;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public QueueSelectorAttachmentKind getKind() {
+        return QueueSelectorAttachmentKind.RULE_ENGINE;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineWorkerSelectorAttachment.java
index dc8333074855..800c8fb25dd8 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineWorkerSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/RuleEngineWorkerSelectorAttachment.java
@@ -41,7 +41,14 @@ public final class RuleEngineWorkerSelectorAttachment extends WorkerSelectorAtta
     @JsonCreator
     public RuleEngineWorkerSelectorAttachment(@JsonProperty(value = "rule") RouterRule rule) {
         this.rule = rule;
-        this.kind = WorkerSelectorAttachmentKind.RULE_ENGINE;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public WorkerSelectorAttachmentKind getKind() {
+        return WorkerSelectorAttachmentKind.RULE_ENGINE;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ScoringRuleOptions.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ScoringRuleOptions.java
index 397e403ac548..81761c95b2ef 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ScoringRuleOptions.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/ScoringRuleOptions.java
@@ -130,20 +130,20 @@ public Boolean isBatchScoringEnabled() {
      * @param isBatchScoringEnabled the isBatchScoringEnabled value to set.
      * @return the ScoringRuleOptions object itself.
      */
-    public ScoringRuleOptions setBatchScoringEnabled(Boolean isBatchScoringEnabled) {
+    private ScoringRuleOptions setIsBatchScoringEnabled(Boolean isBatchScoringEnabled) {
         this.isBatchScoringEnabled = isBatchScoringEnabled;
         return this;
     }
 
     /**
-     * Set the isBatchScoringEnabled property: If set to true, will score workers in batches, and the parameter name of
+     * Set the isBatchSco ringEnabled property: If set to true, will score workers in batches, and the parameter name of
      * the worker labels will be sent as `workers`. By default, set to false and the parameter name for the worker
      * labels will be sent as `worker`. Note: If enabled, use 'batchSize' to set batch size.
      *
      * @param isBatchScoringEnabled the isBatchScoringEnabled value to set.
-     * @return the ScoringRuleOptions object itself.
+     * @return theScoringRuleOptions object itself.
      */
-    public ScoringRuleOptions setIsBatchScoringEnabled(Boolean isBatchScoringEnabled) {
+    public ScoringRuleOptions setBatchScoringEnabled(Boolean isBatchScoringEnabled) {
         this.isBatchScoringEnabled = isBatchScoringEnabled;
         return this;
     }
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticQueueSelectorAttachment.java
index bedef4ef5589..b5ca011c9c63 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticQueueSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticQueueSelectorAttachment.java
@@ -30,7 +30,14 @@ public final class StaticQueueSelectorAttachment extends QueueSelectorAttachment
     @JsonCreator
     public StaticQueueSelectorAttachment(@JsonProperty(value = "queueSelector") RouterQueueSelector queueSelector) {
         this.queueSelector = queueSelector;
-        this.kind = QueueSelectorAttachmentKind.STATIC;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public QueueSelectorAttachmentKind getKind() {
+        return QueueSelectorAttachmentKind.STATIC;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticRouterRule.java
index ab1bb1a3c620..a5b64841ca21 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticRouterRule.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticRouterRule.java
@@ -25,8 +25,14 @@ public final class StaticRouterRule extends RouterRule {
     private RouterValue value;
 
     /** Creates an instance of StaticRouterRule class. */
-    public StaticRouterRule() {
-        this.kind = RouterRuleKind.STATIC;
+    public StaticRouterRule() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public RouterRuleKind getKind() {
+        return RouterRuleKind.STATIC;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticWorkerSelectorAttachment.java
index 78974e365188..ba89d4759a58 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticWorkerSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/StaticWorkerSelectorAttachment.java
@@ -30,7 +30,14 @@ public final class StaticWorkerSelectorAttachment extends WorkerSelectorAttachme
     @JsonCreator
     public StaticWorkerSelectorAttachment(@JsonProperty(value = "workerSelector") RouterWorkerSelector workerSelector) {
         this.workerSelector = workerSelector;
-        this.kind = WorkerSelectorAttachmentKind.STATIC;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public WorkerSelectorAttachmentKind getKind() {
+        return WorkerSelectorAttachmentKind.STATIC;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WaitTimeExceptionTrigger.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WaitTimeExceptionTrigger.java
index a4971b067bc2..d69063683294 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WaitTimeExceptionTrigger.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WaitTimeExceptionTrigger.java
@@ -35,7 +35,14 @@ public final class WaitTimeExceptionTrigger extends ExceptionTrigger {
     @JsonCreator
     public WaitTimeExceptionTrigger(@JsonProperty(value = "thresholdSeconds") Duration threshold) {
         this.threshold = threshold;
-        this.kind = ExceptionTriggerKind.WAIT_TIME;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public ExceptionTriggerKind getKind() {
+        return ExceptionTriggerKind.WAIT_TIME;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WebhookRouterRule.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WebhookRouterRule.java
index 75ae7a81f8a4..73748be1151c 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WebhookRouterRule.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WebhookRouterRule.java
@@ -17,8 +17,8 @@ public final class WebhookRouterRule extends RouterRule {
     /*
      * Uri for Authorization Server.
      */
-    @JsonProperty(value = "authorizationServerUri")
-    private String authorizationServerUri;
+    @JsonProperty(value = "authorizationServerUrl")
+    private String authorizationServerUrl;
 
     /*
      * OAuth2.0 Credentials used to Contoso's Authorization server. Reference:
@@ -28,33 +28,39 @@ public final class WebhookRouterRule extends RouterRule {
     private OAuth2WebhookClientCredential clientCredential;
 
     /*
-     * Uri for Contoso's Web Server.
+     * Url for Contoso's Web Server.
      */
-    @JsonProperty(value = "webhookUri")
-    private String webhookUri;
+    @JsonProperty(value = "webhookUrl")
+    private String webhookUrl;
 
     /** Creates an instance of WebhookRouterRule class. */
-    public WebhookRouterRule() {
-        this.kind = RouterRuleKind.WEBHOOK;
+    public WebhookRouterRule() {}
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public RouterRuleKind getKind() {
+        return RouterRuleKind.WEBHOOK;
     }
 
     /**
-     * Get the authorizationServerUri property: Uri for Authorization Server.
+     * Get the authorizationServerUrl property: Url for Authorization Server.
      *
-     * @return the authorizationServerUri value.
+     * @return the authorizationServerUrl value.
      */
-    public String getAuthorizationServerUri() {
-        return this.authorizationServerUri;
+    public String getAuthorizationServerUrl() {
+        return this.authorizationServerUrl;
     }
 
     /**
      * Set the authorizationServerUri property: Uri for Authorization Server.
      *
-     * @param authorizationServerUri the authorizationServerUri value to set.
+     * @param authorizationServerUrl the authorizationServerUri value to set.
      * @return the WebhookRouterRule object itself.
      */
-    public WebhookRouterRule setAuthorizationServerUri(String authorizationServerUri) {
-        this.authorizationServerUri = authorizationServerUri;
+    public WebhookRouterRule setAuthorizationServerUrl(String authorizationServerUrl) {
+        this.authorizationServerUrl = authorizationServerUrl;
         return this;
     }
 
@@ -71,20 +77,20 @@ public OAuth2WebhookClientCredential getClientCredential() {
     /**
      * Get the webhookUri property: Uri for Contoso's Web Server.
      *
-     * @return the webhookUri value.
+     * @return the webhookUrl value.
      */
-    public String getWebhookUri() {
-        return this.webhookUri;
+    public String getWebhookUrl() {
+        return this.getWebhookUrl();
     }
 
     /**
      * Set the webhookUri property: Uri for Contoso's Web Server.
      *
-     * @param webhookUri the webhookUri value to set.
+     * @param webhookUrl the webhookUri value to set.
      * @return the WebhookRouterRule object itself.
      */
-    public WebhookRouterRule setWebhookUri(String webhookUri) {
-        this.webhookUri = webhookUri;
+    public WebhookRouterRule setWebhookUrl(String webhookUrl) {
+        this.webhookUrl = webhookUrl;
         return this;
     }
 
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationQueueSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationQueueSelectorAttachment.java
index 666b55983909..a2dd2f533cc2 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationQueueSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationQueueSelectorAttachment.java
@@ -32,7 +32,14 @@ public final class WeightedAllocationQueueSelectorAttachment extends QueueSelect
     public WeightedAllocationQueueSelectorAttachment(
             @JsonProperty(value = "allocations") List<QueueWeightedAllocation> allocations) {
         this.allocations = allocations;
-        this.kind = QueueSelectorAttachmentKind.WEIGHTED_ALLOCATION;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public QueueSelectorAttachmentKind getKind() {
+        return QueueSelectorAttachmentKind.WEIGHTED_ALLOCATION;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationWorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationWorkerSelectorAttachment.java
index 9cdaceac4b01..5f1a65d69136 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationWorkerSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WeightedAllocationWorkerSelectorAttachment.java
@@ -32,7 +32,14 @@ public final class WeightedAllocationWorkerSelectorAttachment extends WorkerSele
     public WeightedAllocationWorkerSelectorAttachment(
             @JsonProperty(value = "allocations") List<WorkerWeightedAllocation> allocations) {
         this.allocations = allocations;
-        this.kind = WorkerSelectorAttachmentKind.WEIGHTED_ALLOCATION;
+    }
+
+    /**
+     * Returns kind discriminator.
+     * @return kind.
+     */
+    public WorkerSelectorAttachmentKind getKind() {
+        return WorkerSelectorAttachmentKind.WEIGHTED_ALLOCATION;
     }
 
     /**
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WorkerSelectorAttachment.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WorkerSelectorAttachment.java
index 8834c28f447c..1b8fa463d7a1 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WorkerSelectorAttachment.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/models/WorkerSelectorAttachment.java
@@ -3,6 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 package com.azure.communication.jobrouter.models;
 
+import com.azure.core.annotation.Immutable;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -24,12 +25,13 @@
             name = "weightedAllocation",
             value = WeightedAllocationWorkerSelectorAttachment.class)
 })
+@Immutable
 public abstract class WorkerSelectorAttachment {
     /**
      * kind discriminator.
      */
     @JsonProperty(value = "kind")
-    protected WorkerSelectorAttachmentKind kind;
+    private WorkerSelectorAttachmentKind kind;
 
     /** Creates an instance of WorkerSelectorAttachment class. */
     public WorkerSelectorAttachment() {}
@@ -38,7 +40,5 @@ public WorkerSelectorAttachment() {}
      * Returns kind discriminator.
      * @return kind.
      */
-    public WorkerSelectorAttachmentKind getKind() {
-        return this.kind;
-    }
+    public abstract WorkerSelectorAttachmentKind getKind();
 }